From 706a0ad68c8afb958997b8dff4fd9f5ffd980ae9 Mon Sep 17 00:00:00 2001 From: Xia Kaixiang Date: Fri, 12 Jul 2019 17:28:30 +0800 Subject: [PATCH] =?utf8?q?=E5=8A=9F=E8=83=BD=E6=96=B0=E5=A2=9Ebug?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../dlpay/api/dao/SourceTypeConfigDao.java | 2 +- .../dlpay/api/service/SourceTypeService.java | 18 +++ .../service/impl/SourceTypeServiceImpl.java | 126 +++++++++++++++++- .../dlpay/framework/domain/TResource.java | 3 +- .../system/controller/FunctionController.java | 3 + .../system/service/impl/ParamServiceImpl.java | 2 +- .../service/impl/ShopDataServiceImpl.java | 2 +- .../service/impl/charge_api_service_impl.kt | 18 +-- .../service/impl/consume_pay_service_impl.kt | 79 +---------- .../templates/system/report/shopbusiness.html | 6 +- .../templates/system/report/subjectday.html | 6 +- .../system/report/subjectdetail.html | 6 +- 12 files changed, 169 insertions(+), 102 deletions(-) diff --git a/payapi/src/main/java/com/supwisdom/dlpay/api/dao/SourceTypeConfigDao.java b/payapi/src/main/java/com/supwisdom/dlpay/api/dao/SourceTypeConfigDao.java index 9caf30de..fe9cf033 100644 --- a/payapi/src/main/java/com/supwisdom/dlpay/api/dao/SourceTypeConfigDao.java +++ b/payapi/src/main/java/com/supwisdom/dlpay/api/dao/SourceTypeConfigDao.java @@ -14,7 +14,7 @@ public interface SourceTypeConfigDao extends JpaRepository getBySourceType(String sourceType); - TSourceTypeConfig getBySourceTypeAndAndConfigid(String sourceType, String configid); + TSourceTypeConfig getBySourceTypeAndConfigid(String sourceType, String configid); List getBySourceTypeOrderByConfigid(String paytype); } diff --git a/payapi/src/main/java/com/supwisdom/dlpay/api/service/SourceTypeService.java b/payapi/src/main/java/com/supwisdom/dlpay/api/service/SourceTypeService.java index 86a98418..d5a00d7e 100644 --- a/payapi/src/main/java/com/supwisdom/dlpay/api/service/SourceTypeService.java +++ b/payapi/src/main/java/com/supwisdom/dlpay/api/service/SourceTypeService.java @@ -18,4 +18,22 @@ public interface SourceTypeService { @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class, readOnly = true) Map getPaytypeConfigByPaytype(String pattype); + @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class, readOnly = true) + boolean checkRechargeSourcetype(String sourcetype) throws Exception; + + @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class, readOnly = true) + boolean checkShopPaytype(String shopaccno, String sourceType, boolean anonymousflag) throws Exception; + + /** + * 获取支付能力充值参数全局配置 + */ + @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class, readOnly = true) + Map getChargePaytypeConfig(String paytype, boolean ignoreStatus) throws Exception; + + /** + * 获取商户支付能力消费参数配置 + */ + @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class, readOnly = true) + Map getConsumePaytypeConfig(String paytype, String shopaccno, boolean anonymousflag, boolean ignoreStatus) throws Exception; + } diff --git a/payapi/src/main/java/com/supwisdom/dlpay/api/service/impl/SourceTypeServiceImpl.java b/payapi/src/main/java/com/supwisdom/dlpay/api/service/impl/SourceTypeServiceImpl.java index c2c7f215..b6ed3f10 100644 --- a/payapi/src/main/java/com/supwisdom/dlpay/api/service/impl/SourceTypeServiceImpl.java +++ b/payapi/src/main/java/com/supwisdom/dlpay/api/service/impl/SourceTypeServiceImpl.java @@ -1,10 +1,18 @@ package com.supwisdom.dlpay.api.service.impl; +import com.supwisdom.dlpay.api.dao.ShopSourceTypeConfigDao; +import com.supwisdom.dlpay.api.dao.ShopSourceTypeDao; import com.supwisdom.dlpay.api.dao.SourceTypeConfigDao; import com.supwisdom.dlpay.api.dao.SourceTypeDao; +import com.supwisdom.dlpay.api.domain.TShopSourceType; +import com.supwisdom.dlpay.api.domain.TShopSourceTypeConfig; import com.supwisdom.dlpay.api.domain.TSourceType; import com.supwisdom.dlpay.api.domain.TSourceTypeConfig; import com.supwisdom.dlpay.api.service.SourceTypeService; +import com.supwisdom.dlpay.exception.TransactionProcessException; +import com.supwisdom.dlpay.framework.util.StringUtil; +import com.supwisdom.dlpay.framework.util.TradeErrorCode; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; @@ -19,12 +27,18 @@ import java.util.Map; public class SourceTypeServiceImpl implements SourceTypeService { private final SourceTypeDao paytypeDao; private final SourceTypeConfigDao paytypeConfigDao; + private final ShopSourceTypeDao shopSourceTypeDao; + private final ShopSourceTypeConfigDao shopSourceTypeConfigDao; - public SourceTypeServiceImpl(SourceTypeDao paytypeDao, SourceTypeConfigDao paytypeConfigDao) { + @Autowired + public SourceTypeServiceImpl(SourceTypeDao paytypeDao, SourceTypeConfigDao paytypeConfigDao, ShopSourceTypeDao shopSourceTypeDao, ShopSourceTypeConfigDao shopSourceTypeConfigDao) { this.paytypeDao = paytypeDao; this.paytypeConfigDao = paytypeConfigDao; + this.shopSourceTypeDao = shopSourceTypeDao; + this.shopSourceTypeConfigDao = shopSourceTypeConfigDao; } + @Override @Cacheable(cacheNames = "source_type_cache", keyGenerator = "tenantCacheKey") public TSourceType getByPaytype(String paytype) { @@ -41,4 +55,114 @@ public class SourceTypeServiceImpl implements SourceTypeService { } return map; } + + @Override + public boolean checkRechargeSourcetype(String sourcetype) throws Exception { + TSourceType tSourceType = paytypeDao.getBySourceType(sourcetype); + if (null == tSourceType) { + throw new TransactionProcessException(TradeErrorCode.INPUT_DATA_ERROR, "系统不支持支付方式[" + sourcetype + "]"); + } else if (!tSourceType.getEnable() || !tSourceType.getChargeEnable()) { + throw new TransactionProcessException(TradeErrorCode.INPUT_DATA_ERROR, "系统充值未启用支付方式[" + sourcetype + "]"); + } + return true; + } + + @Override + public boolean checkShopPaytype(String shopaccno, String sourceType, boolean anonymousflag) throws Exception { + //step1: 判断系统支付能力是否启用 + TSourceType tSourceType = paytypeDao.getBySourceType(sourceType); + if (null == tSourceType) { + throw new TransactionProcessException(TradeErrorCode.INPUT_DATA_ERROR, "系统不支持支付方式[" + sourceType + "]"); + } else { + if (!tSourceType.getEnable() || !tSourceType.getConsumeEnable()) { + throw new TransactionProcessException(TradeErrorCode.INPUT_DATA_ERROR, "系统未启用支付方式[" + sourceType + "]消费"); + } + if (anonymousflag && !tSourceType.getAnonymousEnable()) { + throw new TransactionProcessException(TradeErrorCode.INPUT_DATA_ERROR, "系统支付方式[" + sourceType + "]未启用匿名消费"); + } + } + + //step2: 判断商户支付能力是否启用 + TShopSourceType tShopSourceType = shopSourceTypeDao.getById(sourceType, shopaccno); + if (null == tShopSourceType) { + throw new TransactionProcessException(TradeErrorCode.INPUT_DATA_ERROR, "该商户[" + shopaccno + "]未启用支付方式[" + sourceType + "]"); + } else { + if (!tShopSourceType.getConsumeEnable()) { + throw new TransactionProcessException(TradeErrorCode.INPUT_DATA_ERROR, "该商户[" + shopaccno + "]未启用支付方式[" + sourceType + "]消费"); + } + if (anonymousflag && !tShopSourceType.getAnonymousEnable()) { + throw new TransactionProcessException(TradeErrorCode.INPUT_DATA_ERROR, "该商户[" + shopaccno + "]的支付方式[" + sourceType + "]未启用匿名消费"); + } + } + + return true; + } + + @Override + public Map getChargePaytypeConfig(String paytype, boolean ignoreStatus) throws Exception { + TSourceType tSourceType = paytypeDao.getBySourceType(paytype); + if (null == tSourceType) { + throw new TransactionProcessException(TradeErrorCode.INPUT_DATA_ERROR, "系统不支持支付方式[" + paytype + "]"); + } else if (!ignoreStatus && (!tSourceType.getEnable() || !tSourceType.getChargeEnable())) { + throw new TransactionProcessException(TradeErrorCode.INPUT_DATA_ERROR, "系统充值未启用支付方式[" + paytype + "]"); + } + + Map result = new HashMap<>(0); + List list = paytypeConfigDao.getBySourceType(paytype); + if (!StringUtil.isEmpty(list)) { + for (TSourceTypeConfig config : list) { + result.put(config.getConfigid(), config.getConfigValue()); + } + } + return result; + } + + @Override + public Map getConsumePaytypeConfig(String paytype, String shopaccno, boolean anonymousflag, boolean ignoreStatus) throws Exception { + //step1: 判断系统支付能力是否启用 + TSourceType tSourceType = paytypeDao.getBySourceType(paytype); + if (null == tSourceType) { + throw new TransactionProcessException(TradeErrorCode.INPUT_DATA_ERROR, "系统不支持支付方式[" + paytype + "]"); + } else { + if (!ignoreStatus && (!tSourceType.getEnable() || !tSourceType.getConsumeEnable())) { + throw new TransactionProcessException(TradeErrorCode.INPUT_DATA_ERROR, "系统未启用支付方式[" + paytype + "]消费"); + } + if (!ignoreStatus && anonymousflag && !tSourceType.getAnonymousEnable()) { + throw new TransactionProcessException(TradeErrorCode.INPUT_DATA_ERROR, "系统支付方式[" + paytype + "]未启用匿名消费"); + } + } + + //step2: 判断商户支付能力是否启用 + TShopSourceType tShopSourceType = shopSourceTypeDao.getById(paytype, shopaccno); + if (null == tShopSourceType) { + throw new TransactionProcessException(TradeErrorCode.INPUT_DATA_ERROR, "该商户[" + shopaccno + "]未启用支付方式[" + paytype + "]"); + } else { + if (!ignoreStatus && !tShopSourceType.getConsumeEnable()) { + throw new TransactionProcessException(TradeErrorCode.INPUT_DATA_ERROR, "该商户[" + shopaccno + "]未启用支付方式[" + paytype + "]消费"); + } + if (!ignoreStatus && anonymousflag && !tShopSourceType.getAnonymousEnable()) { + throw new TransactionProcessException(TradeErrorCode.INPUT_DATA_ERROR, "该商户[" + shopaccno + "]的支付方式[" + paytype + "]未启用匿名消费"); + } + } + + Map result = new HashMap<>(0); + List list = paytypeConfigDao.getBySourceType(paytype); + if (!StringUtil.isEmpty(list)) { + for (TSourceTypeConfig config : list) { + if (config.getGlobalflag()) { + result.put(config.getConfigid(), config.getConfigValue()); //统用参数 + } + } + } + + List shoplist = shopSourceTypeConfigDao.getShopSourceTypeConfigs(paytype, shopaccno); + if (!StringUtil.isEmpty(shoplist)) { + for (TShopSourceTypeConfig shopconfig : shoplist) { + result.put(shopconfig.getConfigid(), shopconfig.getConfigValue()); //个性参数 + } + } + + return result; + } + } diff --git a/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TResource.java b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TResource.java index 9658a217..13be663f 100644 --- a/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TResource.java +++ b/payapi/src/main/java/com/supwisdom/dlpay/framework/domain/TResource.java @@ -5,7 +5,7 @@ import javax.validation.constraints.NotNull; @Entity @Table(name = "TB_RESOURCE") -@SequenceGenerator(name = "SEQ_RES", sequenceName = "SEQ_RES", allocationSize = 1) +@SequenceGenerator(name = "SEQ_RES", sequenceName = "SEQ_RES", allocationSize = 1000) public class TResource { @Id @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_RES") @@ -13,7 +13,6 @@ public class TResource { private Integer id; @Column(name = "CODE", length = 32) - @NotNull private String code; @Column(name = "NAME", length = 32) diff --git a/payapi/src/main/java/com/supwisdom/dlpay/system/controller/FunctionController.java b/payapi/src/main/java/com/supwisdom/dlpay/system/controller/FunctionController.java index 05d59771..c2dc9d1e 100644 --- a/payapi/src/main/java/com/supwisdom/dlpay/system/controller/FunctionController.java +++ b/payapi/src/main/java/com/supwisdom/dlpay/system/controller/FunctionController.java @@ -123,6 +123,9 @@ public class FunctionController { @ResponseBody public JsonResult addres(@RequestBody TResource resource) { if (resource != null) { + if(null == resource.getTenantId()){ + resource.setTenantId(TenantContext.getTenantSchema()); + } return functionService.saveRes(resource); } else { return JsonResult.error("添加失败"); diff --git a/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/ParamServiceImpl.java b/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/ParamServiceImpl.java index d933a65f..7336a7d4 100644 --- a/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/ParamServiceImpl.java +++ b/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/ParamServiceImpl.java @@ -216,7 +216,7 @@ public class ParamServiceImpl implements ParamService { if (null == tPaytype) throw new WebCheckException("支付能力[" + paytype + "]不存在"); for (String key : param.keySet()) { String value = param.get(key); - TSourceTypeConfig config = paytypeConfigDao.getBySourceTypeAndAndConfigid(tPaytype.getSourceType(), key); + TSourceTypeConfig config = paytypeConfigDao.getBySourceTypeAndConfigid(tPaytype.getSourceType(), key); if (null == config) throw new WebCheckException("支付能力[" + tPaytype.getSourceType() + "]不存在配置项[" + key + "],请重新查询"); config.setConfigValue(StringUtil.isEmpty(value) ? null : value.trim()); diff --git a/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/ShopDataServiceImpl.java b/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/ShopDataServiceImpl.java index 1993949f..24beb2bc 100644 --- a/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/ShopDataServiceImpl.java +++ b/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/ShopDataServiceImpl.java @@ -259,7 +259,7 @@ public class ShopDataServiceImpl implements ShopDataService { spc.setSourceType(shopPaytype.getSourceType()); spc.setConfigid(key); spc.setConfigValue(StringUtil.isEmpty(value) ? null : value.trim()); - TSourceTypeConfig paytypeConfig = sourceTypeConfigDao.getBySourceTypeAndAndConfigid(shopPaytype.getSourceType(), key); + TSourceTypeConfig paytypeConfig = sourceTypeConfigDao.getBySourceTypeAndConfigid(shopPaytype.getSourceType(), key); if (null != paytypeConfig) { spc.setConfigName(paytypeConfig.getConfigName()); } diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/charge_api_service_impl.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/charge_api_service_impl.kt index 3122da3a..d76880f8 100644 --- a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/charge_api_service_impl.kt +++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/charge_api_service_impl.kt @@ -1,38 +1,26 @@ package com.supwisdom.dlpay.api.service.impl import com.supwisdom.dlpay.api.dao.PersondtlDao -import com.supwisdom.dlpay.api.dao.SourceTypeDao import com.supwisdom.dlpay.api.dao.TransactionMainDao import com.supwisdom.dlpay.api.domain.TPersondtl import com.supwisdom.dlpay.api.domain.TTransactionMain import com.supwisdom.dlpay.api.service.ChargeApiService -import com.supwisdom.dlpay.exception.TransactionProcessException +import com.supwisdom.dlpay.api.service.SourceTypeService import com.supwisdom.dlpay.framework.util.StringUtil -import com.supwisdom.dlpay.framework.util.TradeErrorCode import org.springframework.beans.factory.annotation.Autowired import org.springframework.stereotype.Service @Service class ChargeApiServiceImpl : ChargeApiService { @Autowired - lateinit var sourceTypeDao: SourceTypeDao + lateinit var sourceTypeService: SourceTypeService @Autowired lateinit var transactionMainDao: TransactionMainDao @Autowired lateinit var persondtlDao: PersondtlDao override fun checkRechargeSourcetype(sourceType: String): Boolean { - sourceTypeDao.getBySourceType(sourceType).let { - if (null == it) { - throw TransactionProcessException(TradeErrorCode.INPUT_DATA_ERROR, "系统不支持支付方式[$sourceType]") - } else { - if (!it.enable || !it.chargeEnable) { - throw TransactionProcessException(TradeErrorCode.INPUT_DATA_ERROR, "系统充值未启用支付方式[$sourceType]") - } - } - } - - return true + return sourceTypeService.checkRechargeSourcetype(sourceType) } override fun getTransactionMainDtl(refno: String?, billno: String?, outid: String?): TTransactionMain? { diff --git a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/consume_pay_service_impl.kt b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/consume_pay_service_impl.kt index fe0df772..e0fd9ab9 100644 --- a/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/consume_pay_service_impl.kt +++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/consume_pay_service_impl.kt @@ -1,98 +1,27 @@ package com.supwisdom.dlpay.api.service.impl -import com.supwisdom.dlpay.api.dao.SourceTypeDao -import com.supwisdom.dlpay.api.dao.ShopSourceTypeConfigDao -import com.supwisdom.dlpay.api.dao.ShopSourceTypeDao import com.supwisdom.dlpay.api.dao.TransactionMainDao import com.supwisdom.dlpay.api.domain.TTransactionMain import com.supwisdom.dlpay.api.service.ConsumePayService -import com.supwisdom.dlpay.exception.TransactionProcessException +import com.supwisdom.dlpay.api.service.SourceTypeService import com.supwisdom.dlpay.framework.util.StringUtil -import com.supwisdom.dlpay.framework.util.TradeErrorCode import org.springframework.beans.factory.annotation.Autowired import org.springframework.stereotype.Service @Service class ConsumePayServiceImpl : ConsumePayService { @Autowired - lateinit var sourceTypeDao: SourceTypeDao - @Autowired - lateinit var shopSourceTypeDao: ShopSourceTypeDao - @Autowired - lateinit var shopSourceTypeConfigDao: ShopSourceTypeConfigDao + lateinit var sourceTypeService: SourceTypeService @Autowired lateinit var transactionMainDao: TransactionMainDao override fun checkShopPaytype(shopaccno: String, sourceType: String, anonymousflag: Boolean?): Boolean { - sourceTypeDao.getBySourceType(sourceType).let { - if (null == it) { - throw TransactionProcessException(TradeErrorCode.INPUT_DATA_ERROR, "系统不支持支付方式[$sourceType]") - } else { - if (!it.enable || !it.consumeEnable) { - throw TransactionProcessException(TradeErrorCode.INPUT_DATA_ERROR, "系统未启用支付方式[$sourceType]消费") - } - if (true == anonymousflag && !it.anonymousEnable) { - throw TransactionProcessException(TradeErrorCode.INPUT_DATA_ERROR, "系统支付方式[$sourceType]未启用匿名消费") - } - } - } - shopSourceTypeDao.getById(sourceType, shopaccno).let { - if (null == it) { - throw TransactionProcessException(TradeErrorCode.INPUT_DATA_ERROR, "该商户[$shopaccno]未启用支付方式[$sourceType]") - } else { - if (!it.consumeEnable) { - throw TransactionProcessException(TradeErrorCode.INPUT_DATA_ERROR, "该商户[$shopaccno]未启用支付方式[$sourceType]") - } - if (true == anonymousflag && !it.anonymousEnable) { - throw TransactionProcessException(TradeErrorCode.INPUT_DATA_ERROR, "该商户[$shopaccno]的支付方式[$sourceType]未启用匿名消费") - } - } - } - return true + return sourceTypeService.checkShopPaytype(shopaccno, sourceType, true == anonymousflag) } override fun getPaytypeConfig(paytype: String, shopaccno: String, anonymousflag: Boolean?, ignoreStatus: Boolean?): Map { - sourceTypeDao.getBySourceType(paytype).let { - if (null == it) { - throw TransactionProcessException(TradeErrorCode.INPUT_DATA_ERROR, "系统不支持支付方式[$paytype]") - } else { - //对账取配置时不关心状态，不能报错 - if (true != ignoreStatus && (!it.enable || !it.consumeEnable)) { - throw TransactionProcessException(TradeErrorCode.INPUT_DATA_ERROR, "系统未启用支付方式[$paytype]消费") - } - if (true != ignoreStatus && true == anonymousflag && !it.anonymousEnable) { - throw TransactionProcessException(TradeErrorCode.INPUT_DATA_ERROR, "系统支付方式[$paytype]未启用匿名消费") - } - } - } - - shopSourceTypeDao.getById(paytype, shopaccno).let { - if (null == it) { - throw TransactionProcessException(TradeErrorCode.INPUT_DATA_ERROR, "该商户[$shopaccno]未启用支付方式[$paytype]") - } else { - //对账取配置时不关心状态，不能报错 - if (true != ignoreStatus && !it.consumeEnable) { - throw TransactionProcessException(TradeErrorCode.INPUT_DATA_ERROR, "该商户[$shopaccno]未启用支付方式[$paytype]") - } - if (true != ignoreStatus && true == anonymousflag && !it.anonymousEnable) { - throw TransactionProcessException(TradeErrorCode.INPUT_DATA_ERROR, "该商户[$shopaccno]的支付方式[$paytype]未启用匿名消费") - } - } - } - - shopSourceTypeConfigDao.getShopSourceTypeConfigs(paytype, shopaccno)?.let { - if (it.size < 1) { - throw TransactionProcessException(TradeErrorCode.INPUT_DATA_ERROR, "该商户[$shopaccno]的支付方式[$paytype]未配置参数") - } else { - val result = mutableMapOf() - it.forEach { paytypeConfig -> - result.plus(mapOf(paytypeConfig.configid to paytypeConfig.configValue)) - } - return result - } - } - ?: throw TransactionProcessException(TradeErrorCode.INPUT_DATA_ERROR, "该商户[$shopaccno]的支付方式[$paytype]未配置参数") + return sourceTypeService.getConsumePaytypeConfig(paytype, shopaccno, true == anonymousflag, true == ignoreStatus) } override fun getTransactionMainDtl(refno: String?, billno: String?, shopaccno: String?): TTransactionMain? { diff --git a/payapi/src/main/resources/templates/system/report/shopbusiness.html b/payapi/src/main/resources/templates/system/report/shopbusiness.html index c1c042ea..9638612f 100644 --- a/payapi/src/main/resources/templates/system/report/shopbusiness.html +++ b/payapi/src/main/resources/templates/system/report/shopbusiness.html @@ -71,11 +71,13 @@ form.render("checkbox"); laydate.render({ elem: '#shopbusiness-search-startdate', - max: $("#shopbusiness-hidden-maxdate").val() + max: $("#shopbusiness-hidden-maxdate").val(), + trigger: 'click' }); laydate.render({ elem: '#shopbusiness-search-enddate', - max: $("#shopbusiness-hidden-maxdate").val() + max: $("#shopbusiness-hidden-maxdate").val(), + trigger: 'click' }); treeSelect.render({ diff --git a/payapi/src/main/resources/templates/system/report/subjectday.html b/payapi/src/main/resources/templates/system/report/subjectday.html index bcff987e..6804f2c4 100644 --- a/payapi/src/main/resources/templates/system/report/subjectday.html +++ b/payapi/src/main/resources/templates/system/report/subjectday.html @@ -64,11 +64,13 @@ form.render("checkbox"); laydate.render({ elem: '#subjectday-search-startdate', - max: $("#subjectday-hidden-maxdate").val() + max: $("#subjectday-hidden-maxdate").val(), + trigger: 'click' }); laydate.render({ elem: '#subjectday-search-enddate', - max: $("#subjectday-hidden-maxdate").val() + max: $("#subjectday-hidden-maxdate").val(), + trigger: 'click' }); var renderTable = function (obj) { diff --git a/payapi/src/main/resources/templates/system/report/subjectdetail.html b/payapi/src/main/resources/templates/system/report/subjectdetail.html index b8956f2c..f1b65e91 100644 --- a/payapi/src/main/resources/templates/system/report/subjectdetail.html +++ b/payapi/src/main/resources/templates/system/report/subjectdetail.html @@ -62,11 +62,13 @@ form.render("select"); laydate.render({ elem: '#subjectdetail-search-startdate', - max: $("#subjectdetail-hidden-maxdate").val() + max: $("#subjectdetail-hidden-maxdate").val(), + trigger: 'click' }); laydate.render({ elem: '#subjectdetail-search-enddate', - max: $("#subjectdetail-hidden-maxdate").val() + max: $("#subjectdetail-hidden-maxdate").val(), + trigger: 'click' }); treeSelect.render({ -- 2.17.1