developrelease_toaliyun_real
| @@ -69,6 +69,7 @@ spring: | |||||
| username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) | username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) | ||||
| password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) | password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) | ||||
| publisher-confirms: true | publisher-confirms: true | ||||
| publisher-returns: true | |||||
| virtual-host: / | virtual-host: / | ||||
| aws: | aws: | ||||
| @@ -57,6 +57,7 @@ spring: | |||||
| username: ENC(lRmLd6EzgeY1RT5ktcHv9g==) | username: ENC(lRmLd6EzgeY1RT5ktcHv9g==) | ||||
| password: ENC(gBI8mCjr3OC0v57jcnSb660Ux7mW03K2oePgvohhg7w=) | password: ENC(gBI8mCjr3OC0v57jcnSb660Ux7mW03K2oePgvohhg7w=) | ||||
| publisher-confirms: true | publisher-confirms: true | ||||
| publisher-returns: true | |||||
| virtual-host: / | virtual-host: / | ||||
| aws: | aws: | ||||
| @@ -57,6 +57,7 @@ spring: | |||||
| username: ENC(aSRr6mnSryEqzHHz1hJf1g==) | username: ENC(aSRr6mnSryEqzHHz1hJf1g==) | ||||
| password: ENC(GnjF/mdqKdvmDYC0tIIso7+20/jBALPw39tiWCYJ4iw=) | password: ENC(GnjF/mdqKdvmDYC0tIIso7+20/jBALPw39tiWCYJ4iw=) | ||||
| publisher-confirms: true | publisher-confirms: true | ||||
| publisher-returns: true | |||||
| virtual-host: / | virtual-host: / | ||||
| aws: | aws: | ||||
| @@ -69,6 +69,7 @@ spring: | |||||
| username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) | username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) | ||||
| password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) | password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) | ||||
| publisher-confirms: true | publisher-confirms: true | ||||
| publisher-returns: true | |||||
| virtual-host: / | virtual-host: / | ||||
| aws: | aws: | ||||
| @@ -57,6 +57,7 @@ spring: | |||||
| username: ENC(lRmLd6EzgeY1RT5ktcHv9g==) | username: ENC(lRmLd6EzgeY1RT5ktcHv9g==) | ||||
| password: ENC(gBI8mCjr3OC0v57jcnSb660Ux7mW03K2oePgvohhg7w=) | password: ENC(gBI8mCjr3OC0v57jcnSb660Ux7mW03K2oePgvohhg7w=) | ||||
| publisher-confirms: true | publisher-confirms: true | ||||
| publisher-returns: true | |||||
| virtual-host: / | virtual-host: / | ||||
| aws: | aws: | ||||
| @@ -57,6 +57,7 @@ spring: | |||||
| username: ENC(aSRr6mnSryEqzHHz1hJf1g==) | username: ENC(aSRr6mnSryEqzHHz1hJf1g==) | ||||
| password: ENC(GnjF/mdqKdvmDYC0tIIso7+20/jBALPw39tiWCYJ4iw=) | password: ENC(GnjF/mdqKdvmDYC0tIIso7+20/jBALPw39tiWCYJ4iw=) | ||||
| publisher-confirms: true | publisher-confirms: true | ||||
| publisher-returns: true | |||||
| virtual-host: / | virtual-host: / | ||||
| aws: | aws: | ||||
| @@ -70,6 +70,7 @@ spring: | |||||
| username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) | username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) | ||||
| password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) | password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) | ||||
| publisher-confirms: true | publisher-confirms: true | ||||
| publisher-returns: true | |||||
| virtual-host: / | virtual-host: / | ||||
| aws: | aws: | ||||
| @@ -58,6 +58,7 @@ spring: | |||||
| username: ENC(lRmLd6EzgeY1RT5ktcHv9g==) | username: ENC(lRmLd6EzgeY1RT5ktcHv9g==) | ||||
| password: ENC(gBI8mCjr3OC0v57jcnSb660Ux7mW03K2oePgvohhg7w=) | password: ENC(gBI8mCjr3OC0v57jcnSb660Ux7mW03K2oePgvohhg7w=) | ||||
| publisher-confirms: true | publisher-confirms: true | ||||
| publisher-returns: true | |||||
| virtual-host: / | virtual-host: / | ||||
| aws: | aws: | ||||
| @@ -58,6 +58,7 @@ spring: | |||||
| username: ENC(aSRr6mnSryEqzHHz1hJf1g==) | username: ENC(aSRr6mnSryEqzHHz1hJf1g==) | ||||
| password: ENC(GnjF/mdqKdvmDYC0tIIso7+20/jBALPw39tiWCYJ4iw=) | password: ENC(GnjF/mdqKdvmDYC0tIIso7+20/jBALPw39tiWCYJ4iw=) | ||||
| publisher-confirms: true | publisher-confirms: true | ||||
| publisher-returns: true | |||||
| virtual-host: / | virtual-host: / | ||||
| aws: | aws: | ||||
| @@ -69,6 +69,7 @@ spring: | |||||
| username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) | username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) | ||||
| password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) | password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) | ||||
| publisher-confirms: true | publisher-confirms: true | ||||
| publisher-returns: true | |||||
| virtual-host: / | virtual-host: / | ||||
| aws: | aws: | ||||
| @@ -58,6 +58,7 @@ spring: | |||||
| username: ENC(lRmLd6EzgeY1RT5ktcHv9g==) | username: ENC(lRmLd6EzgeY1RT5ktcHv9g==) | ||||
| password: ENC(gBI8mCjr3OC0v57jcnSb660Ux7mW03K2oePgvohhg7w=) | password: ENC(gBI8mCjr3OC0v57jcnSb660Ux7mW03K2oePgvohhg7w=) | ||||
| publisher-confirms: true | publisher-confirms: true | ||||
| publisher-returns: true | |||||
| virtual-host: / | virtual-host: / | ||||
| aws: | aws: | ||||
| @@ -58,6 +58,7 @@ spring: | |||||
| username: ENC(aSRr6mnSryEqzHHz1hJf1g==) | username: ENC(aSRr6mnSryEqzHHz1hJf1g==) | ||||
| password: ENC(GnjF/mdqKdvmDYC0tIIso7+20/jBALPw39tiWCYJ4iw=) | password: ENC(GnjF/mdqKdvmDYC0tIIso7+20/jBALPw39tiWCYJ4iw=) | ||||
| publisher-confirms: true | publisher-confirms: true | ||||
| publisher-returns: true | |||||
| virtual-host: / | virtual-host: / | ||||
| aws: | aws: | ||||
| @@ -69,6 +69,7 @@ spring: | |||||
| username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) | username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) | ||||
| password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) | password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) | ||||
| publisher-confirms: true | publisher-confirms: true | ||||
| publisher-returns: true | |||||
| virtual-host: / | virtual-host: / | ||||
| aws: | aws: | ||||
| @@ -57,6 +57,7 @@ spring: | |||||
| username: ENC(lRmLd6EzgeY1RT5ktcHv9g==) | username: ENC(lRmLd6EzgeY1RT5ktcHv9g==) | ||||
| password: ENC(gBI8mCjr3OC0v57jcnSb660Ux7mW03K2oePgvohhg7w=) | password: ENC(gBI8mCjr3OC0v57jcnSb660Ux7mW03K2oePgvohhg7w=) | ||||
| publisher-confirms: true | publisher-confirms: true | ||||
| publisher-returns: true | |||||
| virtual-host: / | virtual-host: / | ||||
| aws: | aws: | ||||
| @@ -57,6 +57,7 @@ spring: | |||||
| username: ENC(aSRr6mnSryEqzHHz1hJf1g==) | username: ENC(aSRr6mnSryEqzHHz1hJf1g==) | ||||
| password: ENC(GnjF/mdqKdvmDYC0tIIso7+20/jBALPw39tiWCYJ4iw=) | password: ENC(GnjF/mdqKdvmDYC0tIIso7+20/jBALPw39tiWCYJ4iw=) | ||||
| publisher-confirms: true | publisher-confirms: true | ||||
| publisher-returns: true | |||||
| virtual-host: / | virtual-host: / | ||||
| aws: | aws: | ||||
| @@ -69,6 +69,7 @@ spring: | |||||
| username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) | username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) | ||||
| password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) | password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) | ||||
| publisher-confirms: true | publisher-confirms: true | ||||
| publisher-returns: true | |||||
| virtual-host: / | virtual-host: / | ||||
| aws: | aws: | ||||
| @@ -58,6 +58,7 @@ spring: | |||||
| username: ENC(lRmLd6EzgeY1RT5ktcHv9g==) | username: ENC(lRmLd6EzgeY1RT5ktcHv9g==) | ||||
| password: ENC(gBI8mCjr3OC0v57jcnSb660Ux7mW03K2oePgvohhg7w=) | password: ENC(gBI8mCjr3OC0v57jcnSb660Ux7mW03K2oePgvohhg7w=) | ||||
| publisher-confirms: true | publisher-confirms: true | ||||
| publisher-returns: true | |||||
| virtual-host: / | virtual-host: / | ||||
| aws: | aws: | ||||
| @@ -58,6 +58,7 @@ spring: | |||||
| username: ENC(aSRr6mnSryEqzHHz1hJf1g==) | username: ENC(aSRr6mnSryEqzHHz1hJf1g==) | ||||
| password: ENC(GnjF/mdqKdvmDYC0tIIso7+20/jBALPw39tiWCYJ4iw=) | password: ENC(GnjF/mdqKdvmDYC0tIIso7+20/jBALPw39tiWCYJ4iw=) | ||||
| publisher-confirms: true | publisher-confirms: true | ||||
| publisher-returns: true | |||||
| virtual-host: / | virtual-host: / | ||||
| aws: | aws: | ||||
| @@ -8,6 +8,7 @@ import com.iformall.domain.po.*; | |||||
| import com.iformall.enums.EnumMsgModel; | import com.iformall.enums.EnumMsgModel; | ||||
| import com.iformall.enums.EnumScoreType; | import com.iformall.enums.EnumScoreType; | ||||
| import com.iformall.enums.EnumUserType; | import com.iformall.enums.EnumUserType; | ||||
| import com.iformall.exception.MallinkException; | |||||
| import com.iformall.mapper.*; | import com.iformall.mapper.*; | ||||
| import com.iformall.service.WxCreditHistoryService; | import com.iformall.service.WxCreditHistoryService; | ||||
| import com.iformall.utils.DateUtils; | import com.iformall.utils.DateUtils; | ||||
| @@ -56,6 +57,9 @@ public class DataInitController extends BaseController { | |||||
| @Resource | @Resource | ||||
| private WxMerchantBUserMapper merchantBUserMapper; | private WxMerchantBUserMapper merchantBUserMapper; | ||||
| @Resource | |||||
| private WxMerchantMapper wxMerchantMapper; | |||||
| @GetMapping("/init") | @GetMapping("/init") | ||||
| public ResultData init() { | public ResultData init() { | ||||
| @@ -130,7 +134,18 @@ public class DataInitController extends BaseController { | |||||
| return; | return; | ||||
| } | } | ||||
| Map<String, Integer> 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<WxMerchant> wxMerchantList = wxMerchantMapper.findList(wxMerchant); | |||||
| if (wxMerchantList == null || wxMerchantList.size() == 0) { | |||||
| log.debug(ErrorCode.MERCHANT_INFO_NOT_FOUND.getMessage()); | |||||
| return; | |||||
| } | |||||
| //根据商户id和花费金额计算需要新增的积分 | |||||
| Map<String, Integer> result = creditHistoryService.findByMerchantIdAndSpend(wxCreditHistory.getMerchantId(), String.valueOf(wxCreditHistory.getSpend()), wxCreditHistory.getCUserId(),wxCreditHistory.getTenantId()); | |||||
| //Map<String, Integer> result = creditHistoryService.findByMerchantIdAndSpend(wxCreditHistory.getMerchantId(), String.valueOf(wxCreditHistory.getSpend()), wxCreditHistory.getCUserId(), wxCreditHistory.getTenantId()); | |||||
| Integer creditDB = wxCreditHistory.getCreditNum(); | Integer creditDB = wxCreditHistory.getCreditNum(); | ||||
| Integer credit = result.get("credit"); | Integer credit = result.get("credit"); | ||||
| if (Objects.equals(credit, creditDB)) { | if (Objects.equals(credit, creditDB)) { | ||||
| @@ -187,7 +202,7 @@ public class DataInitController extends BaseController { | |||||
| } | } | ||||
| if (ret != null) { | if (ret != null) { | ||||
| log.debug("用户已有积分历史id: {}", ret.getId()); | |||||
| log.debug(" : {}", ret.getId()); | |||||
| return; | return; | ||||
| } | } | ||||
| WxCUser cuUser = cUserMapper.selectByPrimaryKey(co.getcUserId()); | WxCUser cuUser = cUserMapper.selectByPrimaryKey(co.getcUserId()); | ||||
| @@ -70,6 +70,7 @@ spring: | |||||
| username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) | username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) | ||||
| password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) | password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) | ||||
| publisher-confirms: true | publisher-confirms: true | ||||
| publisher-returns: true | |||||
| virtual-host: / | virtual-host: / | ||||
| flyway: | flyway: | ||||
| enabled: true | enabled: true | ||||
| @@ -58,6 +58,7 @@ spring: | |||||
| username: ENC(lRmLd6EzgeY1RT5ktcHv9g==) | username: ENC(lRmLd6EzgeY1RT5ktcHv9g==) | ||||
| password: ENC(gBI8mCjr3OC0v57jcnSb660Ux7mW03K2oePgvohhg7w=) | password: ENC(gBI8mCjr3OC0v57jcnSb660Ux7mW03K2oePgvohhg7w=) | ||||
| publisher-confirms: true | publisher-confirms: true | ||||
| publisher-returns: true | |||||
| virtual-host: / | virtual-host: / | ||||
| flyway: | flyway: | ||||
| enabled: true | enabled: true | ||||
| @@ -58,6 +58,7 @@ spring: | |||||
| username: ENC(aSRr6mnSryEqzHHz1hJf1g==) | username: ENC(aSRr6mnSryEqzHHz1hJf1g==) | ||||
| password: ENC(GnjF/mdqKdvmDYC0tIIso7+20/jBALPw39tiWCYJ4iw=) | password: ENC(GnjF/mdqKdvmDYC0tIIso7+20/jBALPw39tiWCYJ4iw=) | ||||
| publisher-confirms: true | publisher-confirms: true | ||||
| publisher-returns: true | |||||
| virtual-host: / | virtual-host: / | ||||
| flyway: | flyway: | ||||
| enabled: true | enabled: true | ||||
| @@ -69,6 +69,7 @@ spring: | |||||
| username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) | username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) | ||||
| password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) | password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) | ||||
| publisher-confirms: true | publisher-confirms: true | ||||
| publisher-returns: true | |||||
| virtual-host: / | virtual-host: / | ||||
| aws: | aws: | ||||
| @@ -58,6 +58,7 @@ spring: | |||||
| username: ENC(lRmLd6EzgeY1RT5ktcHv9g==) | username: ENC(lRmLd6EzgeY1RT5ktcHv9g==) | ||||
| password: ENC(gBI8mCjr3OC0v57jcnSb660Ux7mW03K2oePgvohhg7w=) | password: ENC(gBI8mCjr3OC0v57jcnSb660Ux7mW03K2oePgvohhg7w=) | ||||
| publisher-confirms: true | publisher-confirms: true | ||||
| publisher-returns: true | |||||
| virtual-host: / | virtual-host: / | ||||
| aws: | aws: | ||||
| @@ -58,6 +58,7 @@ spring: | |||||
| username: ENC(aSRr6mnSryEqzHHz1hJf1g==) | username: ENC(aSRr6mnSryEqzHHz1hJf1g==) | ||||
| password: ENC(GnjF/mdqKdvmDYC0tIIso7+20/jBALPw39tiWCYJ4iw=) | password: ENC(GnjF/mdqKdvmDYC0tIIso7+20/jBALPw39tiWCYJ4iw=) | ||||
| publisher-confirms: true | publisher-confirms: true | ||||
| publisher-returns: true | |||||
| virtual-host: / | virtual-host: / | ||||
| aws: | aws: | ||||