Merge tag '1.0.29' into develop

脱机码

diff --cc payapi-sdk/src/main/java/com/supwisdom/dlpay/paysdk/proxy/UserProxy.java
Simple merge

diff --cc payapi/build.gradle
index 364856c,e029765..62de5b2
--- 1/payapi/build.gradle
--- 2/payapi/build.gradle
+++ b/payapi/build.gradle
@@@ -88,27 -110,50 +110,39 @@@ dependencies 
      implementation group: 'com.sun.jersey', name: 'jersey-client', version: '1.19'
      implementation group: 'javax.servlet', name: 'jstl', version: '1.2'
      implementation group: 'taglibs', name: 'standard', version: '1.1.2'
+     implementation group: 'commons-codec', name: 'commons-codec', version: '1.13'
      implementation files('libs/masmgc.sdk.sms-0.0.1-SNAPSHOT.jar')
 -//    implementation files('libs/ojdbc6.jar')
++    //    implementation files('libs/ojdbc6.jar')
+     implementation 'commons-dbcp:commons-dbcp:1.4'
      implementation 'commons-beanutils:commons-beanutils:1.9.3'
-     implementation 'com.eatthepath:java-otp:0.1.0'
+ 
+     implementation 'log4j:log4j:1.2.17'
+     implementation 'com.alibaba:fastjson:1.2.60'
+ 
+     implementation 'com.eatthepath:java-otp:0.2.0'
      implementation project(':payapi-common')
+     /*支付宝SDK*/
+     implementation group: 'com.alipay.sdk', name: 'alipay-sdk-java', version: '3.7.110.ALL'
+ 
+     /*大理二维码jar*/
+     implementation 'com.supwisdom:dlsmk-qrcode:1.3.5'
+ 
+     annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"
+     annotationProcessor 'org.projectlombok:lombok:1.18.8'
+     compileOnly 'org.projectlombok:lombok:1.18.8'
  
 -//    providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat'
 +    implementation "org.apache.commons:commons-lang3:${lang3Version}"
 +    implementation "net.javacrumbs.shedlock:shedlock-spring:${shedlockVersion}"
 +    implementation "net.javacrumbs.shedlock:shedlock-provider-redis-spring:${shedlockVersion}"
 +
-     implementation "org.bitbucket.b_c:jose4j:${jose4jVersion}"
-     implementation files("libs/masmgc.sdk.sms-0.0.1-SNAPSHOT.jar")
-     implementation "commons-beanutils:commons-beanutils:${beanutilsVersion}"
-     /*支付宝SDK*/
-     implementation "com.alipay.sdk:alipay-sdk-java:${alipaySDKVersion}"
- 
-     implementation "com.github.penggle:kaptcha:${kaptchaVersion}"
-     implementation "com.sun.jersey:jersey-client:${jerseyClientVersion}"
- 
++    //    providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat'
+     testImplementation 'org.springframework.boot:spring-boot-starter-test'
+     testImplementation 'io.rest-assured:rest-assured:3.3.0'
+     testImplementation 'io.rest-assured:spring-mock-mvc:3.3.0'
+     testImplementation 'org.hamcrest:hamcrest:2.1'
  }
  
 -dependencyManagement {
 -    imports {
 -        mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
 -    }
 -}
 -
 -compileKotlin {
 -    kotlinOptions {
 -        freeCompilerArgs = ['-Xjsr305=strict']
 -        jvmTarget = jdkVersion
 -    }
 +tasks.withType(JavaCompile) {
 +    options.encoding = "UTF-8"
  }
  
 -compileTestKotlin {
 -    kotlinOptions {
 -        freeCompilerArgs = ['-Xjsr305=strict']
 -        jvmTarget = jdkVersion
 -    }
 -}

diff --cc payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/PointsServiceImpl.java
index 2d638b6,a1f9c80..15c08ce
--- 1/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/PointsServiceImpl.java
--- 2/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/PointsServiceImpl.java
+++ b/payapi/src/main/java/com/supwisdom/dlpay/system/service/impl/PointsServiceImpl.java
@@@ -77,7 -77,7 +77,7 @@@ public class PointsServiceImpl implemen
    @Override
    public LevelBean getLevel() {
      LevelBean levelBean = new LevelBean();
--    Sort sort = new Sort(Sort.Direction.ASC, "id");
++    Sort sort = Sort.by("id");
      List<TPersonLevel> list = personLevelDao.findAll(sort);
      if (!StringUtil.isEmpty(list)) levelBean.settPersonLevels(list);
      return levelBean;
@@@ -197,7 -197,7 +197,7 @@@
  
    @Override
    public LevelBean getConpoints() {
--    Sort sort = new Sort(Sort.Direction.ASC, "id");
++    Sort sort = Sort.by("id");
      List<TConsumePoints> monthlist = consumePointsDao.findAllByAndRuletype(TradeDict.CONSUME_POINTS_MONTH, sort);
      List<TConsumePoints> daylist = consumePointsDao.findAllByAndRuletype(TradeDict.CONSUME_POINTS_DAY, sort);
      LevelBean levelBean = new LevelBean();
@@@ -364,7 -364,7 +364,7 @@@
      List<TPersondtl> tPersondtl = getShopdtlByUseridAndTransdateAndReverseFlagAndStatus(userid, DateUtil.getNow("yyyyMMdd"), "none", "success");
      Double allConsume = -tPersondtl.stream().mapToDouble(o -> o.getAmount()).sum();
      // 2.循环日消费奖励规则
--    Sort sort = new Sort(Sort.Direction.ASC, "id");
++    Sort sort = Sort.by("id");
      List<TConsumePoints> daylist = consumePointsDao.findAllByAndRuletype(TradeDict.CONSUME_POINTS_DAY, sort);
      for (TConsumePoints temp : daylist) {
        // 3.判断用户是否达到日消费奖励积分的额度，达到再次判断是否获得过该规则的奖励
@@@ -409,7 -409,7 +409,7 @@@
      List<TPersondtl> tPersondtl = getShopdtlByUseridAndTransdateStartingWithAndReverseFlagAndStatus(userid, DateUtil.getNow("yyyyMM"), "none", "success");
      Double allConsume = -tPersondtl.stream().mapToDouble(o -> o.getAmount()).sum();
      // 2.循环月消费奖励规则
--    Sort sort = new Sort(Sort.Direction.ASC, "id");
++    Sort sort = Sort.by("id");
      List<TConsumePoints> monthlist = consumePointsDao.findAllByAndRuletype(TradeDict.CONSUME_POINTS_MONTH, sort);
      for (TConsumePoints temp : monthlist) {
        // 3.判断用户是否达到月消费奖励积分的额度，达到再次判断是否获得过该规则的奖励
@@@ -472,7 -472,7 +472,7 @@@
      List<TPersondtl> tPersondtl = getShopdtlByUseridAndTransdateAndReverseFlagAndStatus(userid, tPointsdtl.getTransdate(), "none", "success");
      Double allConsume = -tPersondtl.stream().mapToDouble(o -> o.getAmount()).sum();
      // 2.2.循环日消费奖励规则
--    Sort sort = new Sort(Sort.Direction.ASC, "id");
++    Sort sort = Sort.by("id");
      List<TConsumePoints> daylist = consumePointsDao.findAllByAndRuletype(TradeDict.CONSUME_POINTS_DAY, sort);
      for (TConsumePoints temp : daylist) {
        // 2.3.判断用户是否达到日消费奖励积分的额度，没有达到再次判断是否获得过该规则的奖励
@@@ -587,7 -587,7 +587,7 @@@
    }
  
    public TPersonLevel getLevelByPoints(Integer points) {
--    Sort sort = new Sort(Sort.Direction.DESC, "id");
++    Sort sort = Sort.by(Sort.Order.desc("id"));
      List<TPersonLevel> all = personLevelDao.findAll(sort);
      for (TPersonLevel temp : all) {
        if (points >= temp.getPointsLower()) {
@@@ -763,7 -763,7 +763,7 @@@
        personLevelResult.setPointsName("消费积分");
        levelBeans.add(personLevelResult);
        //统计日累计消费积分
--      Sort sort = new Sort(Sort.Direction.ASC, "id");
++      Sort sort = Sort.by("id");
        List<TConsumePoints> daylist = consumePointsDao.findAllByAndRuletype(TradeDict.CONSUME_POINTS_DAY, sort);
        List<Integer> dayTemp = daylist.stream().map(TConsumePoints::getId).collect(Collectors.toList());
        LevelBean dayTempBean = new LevelBean();

diff --cc payapi/src/main/kotlin/com/supwisdom/dlpay/api/controller/user_api_controller.kt
Simple merge

diff --cc payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/card_service_impl.kt
index 6c67732,1985c94..34e3cbf
--- 1/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/card_service_impl.kt
--- 2/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/card_service_impl.kt
+++ b/payapi/src/main/kotlin/com/supwisdom/dlpay/api/service/impl/card_service_impl.kt
@@@ -123,10 -126,9 +126,10 @@@ class CardServiceImpl : CardService 
          query.setParameter("starttime", startdate)
          query.setParameter("endtime", enddate)
          query.unwrap(NativeQueryImpl::class.java).setResultTransformer(Transformers.aliasToBean(CitizenCardInfo::class.java))
 +        @Suppress("UNCHECKED_CAST")
          val list = query.resultList as List<CitizenCardInfo>
-         resp.retcode=0
-         resp.retmsg="OK"
+         resp.retcode = 0
+         resp.retmsg = "OK"
          resp.cards = list
          return resp
      }