diff --git a/mallinkBApi/src/main/resources/application-dev.yml b/mallinkBApi/src/main/resources/application-dev.yml index cb96b5895..e465495f6 100644 --- a/mallinkBApi/src/main/resources/application-dev.yml +++ b/mallinkBApi/src/main/resources/application-dev.yml @@ -69,6 +69,7 @@ spring: username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) publisher-confirms: true + publisher-returns: true virtual-host: / aws: diff --git a/mallinkBApi/src/main/resources/application-prod.yml b/mallinkBApi/src/main/resources/application-prod.yml index fa839da92..acaffbdf8 100644 --- a/mallinkBApi/src/main/resources/application-prod.yml +++ b/mallinkBApi/src/main/resources/application-prod.yml @@ -57,6 +57,7 @@ spring: username: ENC(lRmLd6EzgeY1RT5ktcHv9g==) password: ENC(gBI8mCjr3OC0v57jcnSb660Ux7mW03K2oePgvohhg7w=) publisher-confirms: true + publisher-returns: true virtual-host: / aws: diff --git a/mallinkBApi/src/main/resources/application-test.yml b/mallinkBApi/src/main/resources/application-test.yml index c0b4e140d..ca512975a 100644 --- a/mallinkBApi/src/main/resources/application-test.yml +++ b/mallinkBApi/src/main/resources/application-test.yml @@ -57,6 +57,7 @@ spring: username: ENC(aSRr6mnSryEqzHHz1hJf1g==) password: ENC(GnjF/mdqKdvmDYC0tIIso7+20/jBALPw39tiWCYJ4iw=) publisher-confirms: true + publisher-returns: true virtual-host: / aws: diff --git a/mallinkCApi/src/main/resources/application-dev.yml b/mallinkCApi/src/main/resources/application-dev.yml index 04a7c5b81..b78462ff3 100644 --- a/mallinkCApi/src/main/resources/application-dev.yml +++ b/mallinkCApi/src/main/resources/application-dev.yml @@ -69,6 +69,7 @@ spring: username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) publisher-confirms: true + publisher-returns: true virtual-host: / aws: diff --git a/mallinkCApi/src/main/resources/application-prod.yml b/mallinkCApi/src/main/resources/application-prod.yml index a0e7be005..ff09ecadb 100644 --- a/mallinkCApi/src/main/resources/application-prod.yml +++ b/mallinkCApi/src/main/resources/application-prod.yml @@ -57,6 +57,7 @@ spring: username: ENC(lRmLd6EzgeY1RT5ktcHv9g==) password: ENC(gBI8mCjr3OC0v57jcnSb660Ux7mW03K2oePgvohhg7w=) publisher-confirms: true + publisher-returns: true virtual-host: / aws: diff --git a/mallinkCApi/src/main/resources/application-test.yml b/mallinkCApi/src/main/resources/application-test.yml index 37e4ed2ba..c9422fcce 100644 --- a/mallinkCApi/src/main/resources/application-test.yml +++ b/mallinkCApi/src/main/resources/application-test.yml @@ -57,6 +57,7 @@ spring: username: ENC(aSRr6mnSryEqzHHz1hJf1g==) password: ENC(GnjF/mdqKdvmDYC0tIIso7+20/jBALPw39tiWCYJ4iw=) publisher-confirms: true + publisher-returns: true virtual-host: / aws: diff --git a/mallinkCallback/src/main/resources/application-dev.yml b/mallinkCallback/src/main/resources/application-dev.yml index 3aec435da..125d878f5 100644 --- a/mallinkCallback/src/main/resources/application-dev.yml +++ b/mallinkCallback/src/main/resources/application-dev.yml @@ -70,6 +70,7 @@ spring: username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) publisher-confirms: true + publisher-returns: true virtual-host: / aws: diff --git a/mallinkCallback/src/main/resources/application-prod.yml b/mallinkCallback/src/main/resources/application-prod.yml index a97548443..619041695 100644 --- a/mallinkCallback/src/main/resources/application-prod.yml +++ b/mallinkCallback/src/main/resources/application-prod.yml @@ -58,6 +58,7 @@ spring: username: ENC(lRmLd6EzgeY1RT5ktcHv9g==) password: ENC(gBI8mCjr3OC0v57jcnSb660Ux7mW03K2oePgvohhg7w=) publisher-confirms: true + publisher-returns: true virtual-host: / aws: diff --git a/mallinkCallback/src/main/resources/application-test.yml b/mallinkCallback/src/main/resources/application-test.yml index b92a8e4e6..c32ae67c4 100644 --- a/mallinkCallback/src/main/resources/application-test.yml +++ b/mallinkCallback/src/main/resources/application-test.yml @@ -58,6 +58,7 @@ spring: username: ENC(aSRr6mnSryEqzHHz1hJf1g==) password: ENC(GnjF/mdqKdvmDYC0tIIso7+20/jBALPw39tiWCYJ4iw=) publisher-confirms: true + publisher-returns: true virtual-host: / aws: diff --git a/mallinkMQConsumer/src/main/resources/application-dev.yml b/mallinkMQConsumer/src/main/resources/application-dev.yml index fddf5921a..0319ae450 100644 --- a/mallinkMQConsumer/src/main/resources/application-dev.yml +++ b/mallinkMQConsumer/src/main/resources/application-dev.yml @@ -69,6 +69,7 @@ spring: username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) publisher-confirms: true + publisher-returns: true virtual-host: / aws: diff --git a/mallinkMQConsumer/src/main/resources/application-prod.yml b/mallinkMQConsumer/src/main/resources/application-prod.yml index 38cf855e0..1b4f84713 100644 --- a/mallinkMQConsumer/src/main/resources/application-prod.yml +++ b/mallinkMQConsumer/src/main/resources/application-prod.yml @@ -58,6 +58,7 @@ spring: username: ENC(lRmLd6EzgeY1RT5ktcHv9g==) password: ENC(gBI8mCjr3OC0v57jcnSb660Ux7mW03K2oePgvohhg7w=) publisher-confirms: true + publisher-returns: true virtual-host: / aws: diff --git a/mallinkMQConsumer/src/main/resources/application-test.yml b/mallinkMQConsumer/src/main/resources/application-test.yml index 04a0e9037..75f98dcef 100644 --- a/mallinkMQConsumer/src/main/resources/application-test.yml +++ b/mallinkMQConsumer/src/main/resources/application-test.yml @@ -58,6 +58,7 @@ spring: username: ENC(aSRr6mnSryEqzHHz1hJf1g==) password: ENC(GnjF/mdqKdvmDYC0tIIso7+20/jBALPw39tiWCYJ4iw=) publisher-confirms: true + publisher-returns: true virtual-host: / aws: diff --git a/mallinkPosApi/src/main/resources/application-dev.yml b/mallinkPosApi/src/main/resources/application-dev.yml index 449f9b8d2..5800e1335 100644 --- a/mallinkPosApi/src/main/resources/application-dev.yml +++ b/mallinkPosApi/src/main/resources/application-dev.yml @@ -69,6 +69,7 @@ spring: username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) publisher-confirms: true + publisher-returns: true virtual-host: / aws: diff --git a/mallinkPosApi/src/main/resources/application-prod.yml b/mallinkPosApi/src/main/resources/application-prod.yml index 7ce24f371..902ac9c3f 100644 --- a/mallinkPosApi/src/main/resources/application-prod.yml +++ b/mallinkPosApi/src/main/resources/application-prod.yml @@ -57,6 +57,7 @@ spring: username: ENC(lRmLd6EzgeY1RT5ktcHv9g==) password: ENC(gBI8mCjr3OC0v57jcnSb660Ux7mW03K2oePgvohhg7w=) publisher-confirms: true + publisher-returns: true virtual-host: / aws: diff --git a/mallinkPosApi/src/main/resources/application-test.yml b/mallinkPosApi/src/main/resources/application-test.yml index 9d7cc7dba..e3ac551fc 100644 --- a/mallinkPosApi/src/main/resources/application-test.yml +++ b/mallinkPosApi/src/main/resources/application-test.yml @@ -57,6 +57,7 @@ spring: username: ENC(aSRr6mnSryEqzHHz1hJf1g==) password: ENC(GnjF/mdqKdvmDYC0tIIso7+20/jBALPw39tiWCYJ4iw=) publisher-confirms: true + publisher-returns: true virtual-host: / aws: diff --git a/mallinkSchedule/src/main/resources/application-dev.yml b/mallinkSchedule/src/main/resources/application-dev.yml index c6c6f8911..5bba73fa1 100644 --- a/mallinkSchedule/src/main/resources/application-dev.yml +++ b/mallinkSchedule/src/main/resources/application-dev.yml @@ -69,6 +69,7 @@ spring: username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) publisher-confirms: true + publisher-returns: true virtual-host: / aws: diff --git a/mallinkSchedule/src/main/resources/application-prod.yml b/mallinkSchedule/src/main/resources/application-prod.yml index be285d68d..9811ea32d 100644 --- a/mallinkSchedule/src/main/resources/application-prod.yml +++ b/mallinkSchedule/src/main/resources/application-prod.yml @@ -58,6 +58,7 @@ spring: username: ENC(lRmLd6EzgeY1RT5ktcHv9g==) password: ENC(gBI8mCjr3OC0v57jcnSb660Ux7mW03K2oePgvohhg7w=) publisher-confirms: true + publisher-returns: true virtual-host: / aws: diff --git a/mallinkSchedule/src/main/resources/application-test.yml b/mallinkSchedule/src/main/resources/application-test.yml index 3f0409ad3..467bb55ad 100644 --- a/mallinkSchedule/src/main/resources/application-test.yml +++ b/mallinkSchedule/src/main/resources/application-test.yml @@ -58,6 +58,7 @@ spring: username: ENC(aSRr6mnSryEqzHHz1hJf1g==) password: ENC(GnjF/mdqKdvmDYC0tIIso7+20/jBALPw39tiWCYJ4iw=) publisher-confirms: true + publisher-returns: true virtual-host: / aws: diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/DataInitController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/DataInitController.java index efa07062e..5d86ab63b 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/DataInitController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/DataInitController.java @@ -8,6 +8,7 @@ import com.iformall.domain.po.*; import com.iformall.enums.EnumMsgModel; import com.iformall.enums.EnumScoreType; import com.iformall.enums.EnumUserType; +import com.iformall.exception.MallinkException; import com.iformall.mapper.*; import com.iformall.service.WxCreditHistoryService; import com.iformall.utils.DateUtils; @@ -56,6 +57,9 @@ public class DataInitController extends BaseController { @Resource private WxMerchantBUserMapper merchantBUserMapper; + @Resource + private WxMerchantMapper wxMerchantMapper; + @GetMapping("/init") public ResultData init() { @@ -130,7 +134,18 @@ public class DataInitController extends BaseController { return; } - Map result = creditHistoryService.findByMerchantIdAndSpend(wxCreditHistory.getMerchantId(), String.valueOf(wxCreditHistory.getSpend()), wxCreditHistory.getCUserId(), wxCreditHistory.getTenantId()); + WxMerchant wxMerchant = new WxMerchant(); + wxMerchant.setStatus(1); + wxMerchant.setId(wxCreditHistory.getMerchantId()); + List wxMerchantList = wxMerchantMapper.findList(wxMerchant); + if (wxMerchantList == null || wxMerchantList.size() == 0) { + log.debug(ErrorCode.MERCHANT_INFO_NOT_FOUND.getMessage()); + return; + } + //根据商户id和花费金额计算需要新增的积分 + Map result = creditHistoryService.findByMerchantIdAndSpend(wxCreditHistory.getMerchantId(), String.valueOf(wxCreditHistory.getSpend()), wxCreditHistory.getCUserId(),wxCreditHistory.getTenantId()); + + //Map result = creditHistoryService.findByMerchantIdAndSpend(wxCreditHistory.getMerchantId(), String.valueOf(wxCreditHistory.getSpend()), wxCreditHistory.getCUserId(), wxCreditHistory.getTenantId()); Integer creditDB = wxCreditHistory.getCreditNum(); Integer credit = result.get("credit"); if (Objects.equals(credit, creditDB)) { @@ -187,7 +202,7 @@ public class DataInitController extends BaseController { } if (ret != null) { - log.debug("用户已有积分历史id: {}", ret.getId()); + log.debug(" : {}", ret.getId()); return; } WxCUser cuUser = cUserMapper.selectByPrimaryKey(co.getcUserId()); diff --git a/mallinkSysAdmin/src/main/resources/application-dev.yml b/mallinkSysAdmin/src/main/resources/application-dev.yml index 9d654f4f7..bb4679acc 100644 --- a/mallinkSysAdmin/src/main/resources/application-dev.yml +++ b/mallinkSysAdmin/src/main/resources/application-dev.yml @@ -70,6 +70,7 @@ spring: username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) publisher-confirms: true + publisher-returns: true virtual-host: / flyway: enabled: true diff --git a/mallinkSysAdmin/src/main/resources/application-prod.yml b/mallinkSysAdmin/src/main/resources/application-prod.yml index fcaa8d6a4..cf2aee47b 100644 --- a/mallinkSysAdmin/src/main/resources/application-prod.yml +++ b/mallinkSysAdmin/src/main/resources/application-prod.yml @@ -58,6 +58,7 @@ spring: username: ENC(lRmLd6EzgeY1RT5ktcHv9g==) password: ENC(gBI8mCjr3OC0v57jcnSb660Ux7mW03K2oePgvohhg7w=) publisher-confirms: true + publisher-returns: true virtual-host: / flyway: enabled: true diff --git a/mallinkSysAdmin/src/main/resources/application-test.yml b/mallinkSysAdmin/src/main/resources/application-test.yml index c8bed2b51..3dc4d44be 100644 --- a/mallinkSysAdmin/src/main/resources/application-test.yml +++ b/mallinkSysAdmin/src/main/resources/application-test.yml @@ -58,6 +58,7 @@ spring: username: ENC(aSRr6mnSryEqzHHz1hJf1g==) password: ENC(GnjF/mdqKdvmDYC0tIIso7+20/jBALPw39tiWCYJ4iw=) publisher-confirms: true + publisher-returns: true virtual-host: / flyway: enabled: true diff --git a/mallinkWebSocketServer/src/main/resources/application-dev.yml b/mallinkWebSocketServer/src/main/resources/application-dev.yml index 206cb4855..718331eb6 100644 --- a/mallinkWebSocketServer/src/main/resources/application-dev.yml +++ b/mallinkWebSocketServer/src/main/resources/application-dev.yml @@ -69,6 +69,7 @@ spring: username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) publisher-confirms: true + publisher-returns: true virtual-host: / aws: diff --git a/mallinkWebSocketServer/src/main/resources/application-prod.yml b/mallinkWebSocketServer/src/main/resources/application-prod.yml index ad52f7e3b..256ebef07 100644 --- a/mallinkWebSocketServer/src/main/resources/application-prod.yml +++ b/mallinkWebSocketServer/src/main/resources/application-prod.yml @@ -58,6 +58,7 @@ spring: username: ENC(lRmLd6EzgeY1RT5ktcHv9g==) password: ENC(gBI8mCjr3OC0v57jcnSb660Ux7mW03K2oePgvohhg7w=) publisher-confirms: true + publisher-returns: true virtual-host: / aws: diff --git a/mallinkWebSocketServer/src/main/resources/application-test.yml b/mallinkWebSocketServer/src/main/resources/application-test.yml index 99e65ae5b..d8bd05bca 100644 --- a/mallinkWebSocketServer/src/main/resources/application-test.yml +++ b/mallinkWebSocketServer/src/main/resources/application-test.yml @@ -58,6 +58,7 @@ spring: username: ENC(aSRr6mnSryEqzHHz1hJf1g==) password: ENC(GnjF/mdqKdvmDYC0tIIso7+20/jBALPw39tiWCYJ4iw=) publisher-confirms: true + publisher-returns: true virtual-host: / aws: