xiugai

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

@@ -1294,11 +1294,7 @@ public class ElectronicMembershipCardController {
     }
 
 
-    /***
-     * 公众号扫呗支付回调
-     * @param params
-     * @return
-     */
+    //公众号 云闪付扫呗  用户电子会员卡（储蓄卡）充值功能支付回调
     @RequestMapping(value = "/getYunPayGzhCallback", consumes = "text/xml", method = RequestMethod.POST)
     @ResponseBody
     @Transactional
@@ -1314,7 +1310,7 @@ public class ElectronicMembershipCardController {
             result.put("return_msg", "success");
             //业务逻辑
             String ordNo = yunPayCallBack.getTerminal_trace();
-            String amt = yunPayCallBack.getReceipt_fee();
+            String amt = yunPayCallBack.getTotal_fee();
             CustomerCardUseRecord customerCardUseRecord = new CustomerCardUseRecord();
             customerCardUseRecord.setOrderNo(ordNo);
             CustomerCardUseRecord customerCardUseRecordInfo = electronicMembershipCardService.getCardRecordByOrderNo(customerCardUseRecord);

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

@@ -1026,10 +1026,10 @@ public class PayController {
                     }else if(yunPayCallBack.getPay_type().equals("020")){
                         payOrder.setPayType("zfb");
                     }
-                    payOrder.setWxAmt(Double.valueOf(yunPayCallBack.getReceipt_fee()));
+                    payOrder.setWxAmt(Double.valueOf(yunPayCallBack.getTotal_fee()));
                     payOrder.setDzkAmt(Double.valueOf("0"));
                     payOrder.setPayDate(new Timestamp(new Date().getTime()));    //支付时间
-                    payOrder.setReceivedAmt(Double.valueOf(yunPayCallBack.getReceipt_fee())); //settleAmt商家入账金额
+                    payOrder.setReceivedAmt(Double.valueOf(yunPayCallBack.getTotal_fee())); //settleAmt商家入账金额
                     //修改订单状态
                     int count = payOrderService.getUpdatePayOrder(payOrder);
                     if(count == 1){