Просмотр исходного кода

Merge tag 'refs/tags/jenkins-back-end-2781' into release

develop
release_toaliyun_real
Stormeye Wu 6 лет назад
Родитель
Сommit
3c8a7de4a9
25 измененных файлов: 41 добавлений и 2 удалений
  1. +1
    -0
      mallinkBApi/src/main/resources/application-dev.yml
  2. +1
    -0
      mallinkBApi/src/main/resources/application-prod.yml
  3. +1
    -0
      mallinkBApi/src/main/resources/application-test.yml
  4. +1
    -0
      mallinkCApi/src/main/resources/application-dev.yml
  5. +1
    -0
      mallinkCApi/src/main/resources/application-prod.yml
  6. +1
    -0
      mallinkCApi/src/main/resources/application-test.yml
  7. +1
    -0
      mallinkCallback/src/main/resources/application-dev.yml
  8. +1
    -0
      mallinkCallback/src/main/resources/application-prod.yml
  9. +1
    -0
      mallinkCallback/src/main/resources/application-test.yml
  10. +1
    -0
      mallinkMQConsumer/src/main/resources/application-dev.yml
  11. +1
    -0
      mallinkMQConsumer/src/main/resources/application-prod.yml
  12. +1
    -0
      mallinkMQConsumer/src/main/resources/application-test.yml
  13. +1
    -0
      mallinkPosApi/src/main/resources/application-dev.yml
  14. +1
    -0
      mallinkPosApi/src/main/resources/application-prod.yml
  15. +1
    -0
      mallinkPosApi/src/main/resources/application-test.yml
  16. +1
    -0
      mallinkSchedule/src/main/resources/application-dev.yml
  17. +1
    -0
      mallinkSchedule/src/main/resources/application-prod.yml
  18. +1
    -0
      mallinkSchedule/src/main/resources/application-test.yml
  19. +17
    -2
      mallinkSysAdmin/src/main/java/com/iformall/controller/sys/DataInitController.java
  20. +1
    -0
      mallinkSysAdmin/src/main/resources/application-dev.yml
  21. +1
    -0
      mallinkSysAdmin/src/main/resources/application-prod.yml
  22. +1
    -0
      mallinkSysAdmin/src/main/resources/application-test.yml
  23. +1
    -0
      mallinkWebSocketServer/src/main/resources/application-dev.yml
  24. +1
    -0
      mallinkWebSocketServer/src/main/resources/application-prod.yml
  25. +1
    -0
      mallinkWebSocketServer/src/main/resources/application-test.yml

+ 1
- 0
mallinkBApi/src/main/resources/application-dev.yml Просмотреть файл

@@ -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:


+ 1
- 0
mallinkBApi/src/main/resources/application-prod.yml Просмотреть файл

@@ -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:


+ 1
- 0
mallinkBApi/src/main/resources/application-test.yml Просмотреть файл

@@ -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:


+ 1
- 0
mallinkCApi/src/main/resources/application-dev.yml Просмотреть файл

@@ -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:


+ 1
- 0
mallinkCApi/src/main/resources/application-prod.yml Просмотреть файл

@@ -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:


+ 1
- 0
mallinkCApi/src/main/resources/application-test.yml Просмотреть файл

@@ -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:


+ 1
- 0
mallinkCallback/src/main/resources/application-dev.yml Просмотреть файл

@@ -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:


+ 1
- 0
mallinkCallback/src/main/resources/application-prod.yml Просмотреть файл

@@ -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:


+ 1
- 0
mallinkCallback/src/main/resources/application-test.yml Просмотреть файл

@@ -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:


+ 1
- 0
mallinkMQConsumer/src/main/resources/application-dev.yml Просмотреть файл

@@ -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:


+ 1
- 0
mallinkMQConsumer/src/main/resources/application-prod.yml Просмотреть файл

@@ -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:


+ 1
- 0
mallinkMQConsumer/src/main/resources/application-test.yml Просмотреть файл

@@ -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:


+ 1
- 0
mallinkPosApi/src/main/resources/application-dev.yml Просмотреть файл

@@ -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:


+ 1
- 0
mallinkPosApi/src/main/resources/application-prod.yml Просмотреть файл

@@ -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:


+ 1
- 0
mallinkPosApi/src/main/resources/application-test.yml Просмотреть файл

@@ -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:


+ 1
- 0
mallinkSchedule/src/main/resources/application-dev.yml Просмотреть файл

@@ -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:


+ 1
- 0
mallinkSchedule/src/main/resources/application-prod.yml Просмотреть файл

@@ -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:


+ 1
- 0
mallinkSchedule/src/main/resources/application-test.yml Просмотреть файл

@@ -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:


+ 17
- 2
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.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());


+ 1
- 0
mallinkSysAdmin/src/main/resources/application-dev.yml Просмотреть файл

@@ -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


+ 1
- 0
mallinkSysAdmin/src/main/resources/application-prod.yml Просмотреть файл

@@ -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


+ 1
- 0
mallinkSysAdmin/src/main/resources/application-test.yml Просмотреть файл

@@ -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


+ 1
- 0
mallinkWebSocketServer/src/main/resources/application-dev.yml Просмотреть файл

@@ -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:


+ 1
- 0
mallinkWebSocketServer/src/main/resources/application-prod.yml Просмотреть файл

@@ -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:


+ 1
- 0
mallinkWebSocketServer/src/main/resources/application-test.yml Просмотреть файл

@@ -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:


Загрузка…
Отмена
Сохранить