修改

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

@@ -64,7 +64,7 @@ public class ElectronicMembershipCardController {
     }
 
     //用户充值电子会员卡（储蓄卡）生成充值记录
-    @RequestMapping(value = "/rechargeBalance", method = RequestMethod.POST)
+    @RequestMapping(value = "/rechargeBalance", consumes = "application/json", method = RequestMethod.POST)
     @ResponseBody
     @Transactional
     public String rechargeBalance(@RequestBody RechargeBalance rechargeBalance){
@@ -82,6 +82,12 @@ public class ElectronicMembershipCardController {
             String unionId = rechargeBalance.getUnionId();
             String stationName = rechargeBalance.getStationName();
             String stationCardEnabledFlag = electronicMembershipCardService.getStationCardEnabledFlag(stationId);
+            logger.info("充值金额："+amt);
+            logger.info("支付类型："+payType);
+            logger.info("充值卡类型："+cardOilsType);
+            logger.info("充值金额："+amt);
+            logger.info("油站ID："+stationId);
+            logger.info("充值unionId："+unionId);
             //是否启用电子卡功能
             if(stationCardEnabledFlag.equals("1")){
                 CustomerCardUseRecord customerCardUseRecord = new CustomerCardUseRecord();      //电子会员卡使用记录
@@ -105,7 +111,7 @@ public class ElectronicMembershipCardController {
                     calendar.setTime(new Date());   //获取当前时间
                     //循环优惠规则明细
                     for (CustomerCardSettingDetail cardDetail : cardRechargeSettingList.get(0).getCustomerCardSettingDetailList()){
-                        if(amt.compareTo(cardDetail.getDiscountAmtEnd()) ==1 || amt.compareTo(cardDetail.getDiscountAmtEnd()) ==0){
+                        if(amt.compareTo(cardDetail.getDiscountAmtEnd()) ==-1 || amt.compareTo(cardDetail.getDiscountAmtEnd()) ==0){
                             //String isDiscountCoupon = cardRechargeSettingList.get(0).getIsDiscountCoupon();       //是否使用优惠券
                             //充值优惠类型
                             if(cardDetail.getSettingRuleType().equals("1")){ //按充值金额
@@ -170,6 +176,7 @@ public class ElectronicMembershipCardController {
                                 }
                                 customerCardUseRecord.setAmt(amt);
                                 customerCardUseRecord.setPresentAmt(presentAmt);
+                                //customerCardUseRecord.setBalance(amt.add(presentAmt));
                             }
                             break;
                         }
@@ -190,10 +197,12 @@ public class ElectronicMembershipCardController {
 
                 CustomerElectronicCard c = new CustomerElectronicCard();    //电子会员卡
                 c.setUnionId(unionId);
+                c.setStationId(stationId);
                 c.setCardOilsType(cardOilsType);
                 CustomerElectronicCard electronicCardInfoByUnionId = electronicMembershipCardService.getElectronicCardInfoByUnionId(c);
                 if(electronicCardInfoByUnionId !=null && electronicCardInfoByUnionId.getCustomerNo() !=null){
                     customerCardUseRecord.setCustomerNo(electronicCardInfoByUnionId.getCustomerNo());
+                    customerCardUseRecord.setBalance(amt.add(customerCardUseRecord.getPresentAmt()).add(electronicCardInfoByUnionId.getAmt()));
                 }
                 //订单规则 时间+6位随机数
                 Random random = new Random();