修复bug

qmjszx-admin/src/main/java/beilv/web/controller/carinformation/cardAppController.java

@@ -17,8 +17,12 @@ import beilv.vipCardLog.domain.VipCardLog;
 import beilv.vipCardLog.service.IVipCardLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.math.RoundingMode;
 import java.util.List;
 
 /**
@@ -80,7 +84,7 @@ public class cardAppController extends BaseController {
     @ResponseBody
     public AjaxResult addVipCardLogCallBack(@RequestBody VipCardLog vipCardLog) {
         if (StringUtils.isEmpty(vipCardLog.getOrderId())) {
-            return AjaxResult.error("订单id不能为空!");
+            return AjaxResult.error("订单号不能为空!");
         }
 
         if ("payment_status_have_paid".equals(vipCardLog.getPaymentStatus())) {
@@ -95,15 +99,17 @@ public class cardAppController extends BaseController {
                 vipCardService.insertVipCard(new VipCard(Long.parseLong(orderInfo.getUserId()), orderInfo.getPracticalMoney()));
             } else {
                 //false 有会员卡,
-                long l = Long.parseLong(orderInfo.getPracticalMoney()) + Long.parseLong(vipCard.getBalance());
-                vipCardService.updateVipCard(new VipCard(Long.parseLong(orderInfo.getUserId()), String.valueOf(l)));
+
+                vipCardService.updateVipCard(new VipCard(Long.parseLong(orderInfo.getUserId()), orderInfo.getPracticalMoney().add(vipCard.getBalance()).setScale(2, RoundingMode.HALF_UP)));
             }
 
             vipCardLog.setPaymentTime(DateUtils.getNowDate());
-            return toAjax(vipCardLogService.updateVipCardLogByOrderId(vipCardLog));
+        } else if ("payment_status_cancelled".equals(vipCardLog.getPaymentStatus())) {
+            vipCardLog.setCancellationTime(DateUtils.getNowDate());
         } else {
             return AjaxResult.error("支付状态错误!");
         }
+        return toAjax(vipCardLogService.updateVipCardLogByOrderId(vipCardLog));
     }
 
 

qmjszx-business/src/main/java/beilv/vipCard/domain/VipCard.java

@@ -8,6 +8,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.apache.ibatis.type.Alias;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -46,7 +47,7 @@ public class VipCard extends BaseEntity {
      * 卡内余额
      */
     @Excel(name = "卡内余额")
-    private String balance;
+    private BigDecimal balance;
 
     /**
      * 退卡时间
@@ -64,7 +65,7 @@ public class VipCard extends BaseEntity {
     private String username;
     private String mobile;
 
-    public VipCard(Long userId, String balance) {
+    public VipCard(Long userId, BigDecimal balance) {
         this.userId = userId;
         this.balance = balance;
     }

qmjszx-business/src/main/java/beilv/vipCard/service/impl/VipCardServiceImpl.java

@@ -9,6 +9,7 @@ import beilv.vipCard.service.IVipCardService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -94,7 +95,7 @@ public class VipCardServiceImpl implements IVipCardService {
 
     @Override
     public int refundById(VipCard vipCard) {
-        vipCard.setBalance("0");
+        vipCard.setBalance(BigDecimal.valueOf(0));
         vipCard.setRefundTime(DateUtils.getNowDate());
         vipCard.setCardState("vip_card_state_close");
         return vipCardMapper.updateVipCard(vipCard);

qmjszx-business/src/main/java/beilv/vipCardLog/domain/VipCardLog.java

@@ -8,6 +8,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.apache.ibatis.type.Alias;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -79,6 +80,6 @@ public class VipCardLog extends BaseEntity {
      * 支付金额
      */
     @Excel(name = "支付金额")
-    private String practicalMoney;
+    private BigDecimal practicalMoney;
 
 }