修改

YijiaRestful/src/main/java/com/platform/yijia/controller/PayController.java

@@ -609,9 +609,9 @@ public class PayController {
                                     calculateIntegralInfos = this.calculateIntegral(calculateIntegral);
                                     //插入客户所得积分
                                     customerPoints = this.insertUserIntegral(calculateIntegralInfos);
+                                    integral =calculateIntegralInfos.getIntegral();
                                     //推送积分
                                     this.pushIntegral(customerPoints, calculateIntegral);
-                                    integral =calculateIntegralInfos.getIntegral();
                                 }
                             }else {
                                 if(stationInfos.getIntegralFlag().equals("1")){
@@ -620,8 +620,9 @@ public class PayController {
                                     //插入客户所得积分
                                     customerPoints = this.insertUserIntegral(calculateIntegralInfos);
                                     //推送积分
-                                    this.pushIntegral(customerPoints, calculateIntegral);
                                     integral =calculateIntegralInfos.getIntegral();
+                                    this.pushIntegral(customerPoints, calculateIntegral);
+
                                 }
                             }
 

YijiaRestful/src/main/resources/application.yml

@@ -16,10 +16,10 @@ pagehelper:
 # 域名 路径前缀动态配置
 yijia:
     # 域名： 测试：mp.huijy.net  生产：www.huijy.net
-    domainName: mp.huijy.net
+    domainName: www.huijy.net
     # 路径前缀 test：测试； api：生产一线；prod：生产二线； demo：演示；
     path:
-        global-prefix: demo
+        global-prefix: prod
 
 
 # POS机登录解密密文密码
@@ -29,8 +29,8 @@ yijia:
 # Spring配置
 spring:
     datasource:
-#        url: jdbc:mysql://47.105.116.204:3306/jiaduoduo_db?useUnicode=true&characterEncoding=utf8&nullCatalogMeansCurrent=true&serverTimezone=GMT%2b8&useSSL=true
-        url: jdbc:mysql://115.28.211.17:3306/jiaduoduo_db_test?useUnicode=true&characterEncoding=utf8&nullCatalogMeansCurrent=true&serverTimezone=GMT%2b8&useSSL=true
+        url: jdbc:mysql://47.105.116.204:3306/jiaduoduo_db?useUnicode=true&characterEncoding=utf8&nullCatalogMeansCurrent=true&serverTimezone=GMT%2b8&useSSL=true
+#        url: jdbc:mysql://115.28.211.17:3306/jiaduoduo_db_test?useUnicode=true&characterEncoding=utf8&nullCatalogMeansCurrent=true&serverTimezone=GMT%2b8&useSSL=true
         username: develop
         password: 1234.Abcd
         driver-class-name: com.mysql.cj.jdbc.Driver

YijiaRestful/src/main/resources/mapper/PayOrderMapper.xml

@@ -342,6 +342,7 @@
                 AND T1.pay_date < #{endTime}
             </if>
         </where>
+        OEDER BY T1.pay_date DESC
     </select>