bug

fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java

@@ -49,7 +49,7 @@ public class Const {
     public static String NOTIFY_PUBLIC_KEYS="MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbBAl3xSB7YeUnze4yYZmnTeT7OtXZr0sP10TsDVRH2SY/VEjgS9KPmHMmVeKZT3+6xKsUvulgVyie46GGtZPrnoh+glF1gzsYAXJ7dvR/R5nYO5VvfwK/ChPFTiKhbTtO4OKtchgBZuqCbsemG+gFIiVJo37dY0Kg0zISmFHdOQIDAQAB";
 
     //异步通知(回调地址)
-//    public static String notify_url = "https://www.fuint.cn/fuint-application/clientApi/pay/aliPayCallback";
+//    public static String notify_url = "https://www.tuofeng.cc/oilAdmin/api/fyPay/notify";
     public static String notify_url = "https://8q4f124343.yicp.fun/api/fyPay/notify";
 
     //下单

fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/GrowthValueChange.java

@@ -49,11 +49,11 @@ public class GrowthValueChange extends BaseEntity implements Serializable {
     /**
      * 成长值变化值
      */
-    private Double growthValue;
+    private Integer growthValue;
     /**
      * 变化之后的成长值
      */
-    private Double afterTheChange;
+    private Integer afterTheChange;
     /**
      * 订单号
      */

fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java

@@ -92,6 +92,8 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
     private LJGoodsService goodsService;
     @Autowired
     private StaffCommissionService staffCommissionService;
+    @Autowired
+    private GrowthValueChangeService growthValueChangeService;
 
     @Override
     public IPage<OilOrder> selectOilOrderList(Page page, OilOrder order) {
@@ -812,6 +814,8 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
         Integer gasGrowthValue = null;
         Integer dieselGrowthValue = null;
         Integer naturalGrowthValue = null;
+        Integer addGrowthVal = null;
+        Integer growthAfter =  null;
 
         LJStore store = storeService.selectStoreByStoreId(storeId);
         UserBalance balance = userBalanceService.selectUserBalance(userid,store.getChainStoreId());
@@ -841,7 +845,8 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
         if (oilName.getOilType().equals("汽油")){
             gasGrowthValue = Integer.valueOf(sysConfigService.getValueByKey("gas_growth_value"));
             Integer addVal = (int) (gasGrowthValue * oilActualPay);
-            Integer growthAfter = growth + addVal;
+            addGrowthVal = addVal;
+            growthAfter = growth + addVal;
 //                如果会员成长值达到会员等级成长值，则修改会员的会员等级信息
             for (int i = 0; i < records.size(); i++){
                 if ((growthAfter-records.get(i).getGrowthValue())<100){
@@ -855,7 +860,8 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
         }else if(oilName.getOilType().equals("柴油")){
             dieselGrowthValue = Integer.valueOf(sysConfigService.getValueByKey("diesel_growth_value"));
             Integer addVal = (int) (dieselGrowthValue * oilActualPay);
-            Integer growthAfter = growth + addVal;
+            addGrowthVal = addVal;
+            growthAfter = growth + addVal;
 //                如果会员成长值达到会员等级成长值，则修改会员的会员等级信息
             for (int i = 0; i < records.size(); i++){
                 if ((growthAfter-records.get(i).getGrowthValue())<100 && (growthAfter-records.get(i).getGrowthValue())>0){
@@ -869,7 +875,8 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
         }else{
             naturalGrowthValue = Integer.valueOf(sysConfigService.getValueByKey("natural_growth_value"));
             Integer addVal = (int) (naturalGrowthValue * oilActualPay);
-            Integer growthAfter = growth + addVal;
+            addGrowthVal = addVal;
+            growthAfter = growth + addVal;
 //                如果会员成长值达到会员等级成长值，则修改会员的会员等级信息
             for (int i = 0; i < records.size(); i++){
                 if ((growthAfter-records.get(i).getGrowthValue())<100){
@@ -883,6 +890,8 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
         }
 //            balance.setCardBalance(balance.getCardBalance()-oilActualPay);
         userBalanceService.updateUserBalance(balance);
+
+        this.insertGrowthValueChange(userid,storeId,addGrowthVal,growthAfter,orderNo);
         this.insertCardBalance(oilActualPay,userid,storeId,orderNo);
     }
 
@@ -1246,6 +1255,8 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
             Integer gasGrowthValue = null;
             Integer dieselGrowthValue = null;
             Integer naturalGrowthValue = null;
+            Integer addGrowthVal = null;
+            Integer growthAfter =  null;
             LJStore store = storeService.selectStoreByStoreId(storeId);
             UserBalance balance = userBalanceService.selectUserBalance(userid,store.getChainStoreId());
             int growth = balance.getGrowthValue();
@@ -1283,7 +1294,8 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
             if (oilName.getOilType().equals("汽油")){
                 gasGrowthValue = Integer.valueOf(sysConfigService.getValueByKey("gas_growth_value"));
                 Integer addVal = (int) (gasGrowthValue * oilActualPay);
-                Integer growthAfter = growth + addVal;
+                addGrowthVal = addVal;
+                growthAfter = growth + addVal;
 //                如果会员成长值达到会员等级成长值，则修改会员的会员等级信息
                 for (int i = 0; i < records.size(); i++){
                     if ((growthAfter-records.get(i).getGrowthValue())<100){
@@ -1297,7 +1309,8 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
             }else if(oilName.getOilType().equals("柴油")){
                 dieselGrowthValue = Integer.valueOf(sysConfigService.getValueByKey("diesel_growth_value"));
                 Integer addVal = (int) (dieselGrowthValue * oilActualPay);
-                Integer growthAfter = growth + addVal;
+                addGrowthVal = addVal;
+                growthAfter = growth + addVal;
 //                如果会员成长值达到会员等级成长值，则修改会员的会员等级信息
                 for (int i = 0; i < records.size(); i++){
                     if ((growthAfter-records.get(i).getGrowthValue())<100 && (growthAfter-records.get(i).getGrowthValue())>0){
@@ -1311,7 +1324,8 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
             }else{
                 naturalGrowthValue = Integer.valueOf(sysConfigService.getValueByKey("natural_growth_value"));
                 Integer addVal = (int) (naturalGrowthValue * oilActualPay);
-                Integer growthAfter = growth + addVal;
+                addGrowthVal = addVal;
+                growthAfter = growth + addVal;
 //                如果会员成长值达到会员等级成长值，则修改会员的会员等级信息
                 for (int i = 0; i < records.size(); i++){
                     if ((growthAfter-records.get(i).getGrowthValue())<100){
@@ -1328,6 +1342,8 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
             balance.setConsumeNum(consumeNum+1);
             userBalanceService.updateUserBalance(balance);
 
+            this.insertGrowthValueChange(userid,storeId,addGrowthVal,growthAfter,orderNo);
+
             CardBalanceChange cardBalanceChange = new CardBalanceChange();
 //        添加余额记录信息
             cardBalanceChange.setUserId(userid);
@@ -1373,6 +1389,20 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
         cardBalanceChangeService.insertCardBalance(cardBalanceChange);
     }
 
+    private void insertGrowthValueChange(Integer userId,Integer storeId,Integer growthValue,Integer growthValueAfter,String orderNo){
+        LJStore store = storeService.selectStoreByStoreId(storeId);
+        GrowthValueChange growthValueChange = new GrowthValueChange();
+        growthValueChange.setUserId(userId);
+        growthValueChange.setStoreId(storeId);
+        growthValueChange.setChainStoreId(store.getChainStoreId());
+        growthValueChange.setChangeType("1");
+        growthValueChange.setFromType("油品订单消费");
+        growthValueChange.setGrowthValue(growthValue);
+        growthValueChange.setAfterTheChange(growthValueAfter);
+        growthValueChange.setOrderNo(orderNo);
+        growthValueChangeService.insertGrowthValueChange(growthValueChange);
+    }
+
     /**
      * 添加囤油卡消费记录
      * @param userId