电子卡支付优化

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

@@ -341,6 +341,8 @@ public class ElectronicMembershipCardController {
                 String oilLiters = resultMap.get("orderLiters").toString();   //orderLiters
                 String receivableAmt = resultMap.get("receivableAmt").toString();
                 String amt = resultMap.get("amt").toString();
+                String discountAmt = resultMap.get("discountAmt").toString();
+                String dzkAmt = resultMap.get("dzkAmt").toString();
                 String oilType = resultMap.get("oilType").toString();
                 String groupId = resultMap.get("groupId").toString();
                 //String oilGun = resultMap.get("oilGun").toString();
@@ -401,9 +403,12 @@ public class ElectronicMembershipCardController {
                     resultMap.put("payType","dzk");
                     payOrder.setStatus("1");
                     payOrder.setPayDate(new Timestamp(new Date().getTime()));    //支付时间
-                    payOrder.setReceivedAmt(Double.valueOf(amt));
-                    payOrder.setDzkAmt(Double.valueOf(amt));
+                    payOrder.setReceivedAmt(Double.valueOf(dzkAmt));
+                    payOrder.setAmt(Double.valueOf(dzkAmt));
+                    payOrder.setDzkAmt(Double.valueOf(dzkAmt));
                     //payOrder.setTransactionId(ordNo);
+                    //BigDecimal discountAmt = new BigDecimal(receivableAmt).subtract(new BigDecimal(dzkAmt));
+                    payOrder.setDiscountAmt(Double.valueOf(discountAmt));
                     payOrderService.getUpdatePayOrder(payOrder);
                     //插入集团客户信息
                     //insertCustomerGroup(resultMap);
@@ -497,7 +502,7 @@ public class ElectronicMembershipCardController {
                             wxMpTemplate.add(new WxMpTemplateData("keyword2", stationName));
                             wxMpTemplate.add(new WxMpTemplateData("keyword3", oilName));
                             wxMpTemplate.add(new WxMpTemplateData("keyword4", "电子卡"));
-                            wxMpTemplate.add(new WxMpTemplateData("keyword5", amt));
+                            wxMpTemplate.add(new WxMpTemplateData("keyword5", dzkAmt));
                             wxMpTemplate.add(new WxMpTemplateData("remark","感谢您在"+stationName+"本次消费，当前还剩余额 "+c.getAmt()+"元，祝您生活愉快~！"));
                             GzhNewsTemplate gzhNewsTemplate = new GzhNewsTemplate();
                             gzhNewsTemplate.setStationId(Integer.valueOf(stationId));
@@ -519,7 +524,7 @@ public class ElectronicMembershipCardController {
                     calculateIntegral.setOrderNo(ordNo);                                            //订单号
                     calculateIntegral.setCustomerGrade(customerManage.getGrade());                  //客户等级
                     calculateIntegral.setIntegralRuleFlag(stationInfos.getIntegralRuleFlagGroup());      //是否共享积分
-                    calculateIntegral.setAmt(new BigDecimal(amt));                                  //客户实收金额
+                    calculateIntegral.setAmt(new BigDecimal(dzkAmt));                                  //客户实收金额
                     calculateIntegral.setReceivableAmt(new BigDecimal(receivableAmt));              //应收金额
                     calculateIntegral.setOilLiters(new BigDecimal(oilLiters));                      //加油升数
                     calculateIntegral.setOilName(oilName);                                          //油品名称

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

@@ -265,9 +265,8 @@ public class IntegralShoppingMallController {
                             GzhNewsTemplate gzhNewsTemplateInfo = gzhNewsTemplateService.getGzhNewsTemplate(gzhNewsTemplate);
                             if(gzhNewsTemplateInfo !=null && gzhNewsTemplateInfo.getTemplateId() !=null){
                                 wxPushUtil.push(gzhAppId, gzhAppSecret, gzhNewsTemplateInfo.getTemplateId(), request.getOpenId(), wxMpTemplate);
-                                resultData=ResultData.success(CodeMsg.SUCCESS);
                             }
-
+                            resultData=ResultData.success(CodeMsg.SUCCESS);
                             StationInfo stationInfo = new StationInfo();
                             stationInfo.setStationId(request.getStationId());
                             //获取油站功能信息

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

@@ -137,7 +137,7 @@ public class PayOrderController {
                             payOrder.setOilPersonnel(oilPersonnel.substring(0, oilPersonnel.length()-1));   //加油员
                         }
                     }else {
-                        payOrder.setOilPersonnel("");
+                        payOrder.setOilPersonnel("--");
                     }
                     if(oilsType.equals("3")){                                                  //订单类型是油品时计算
                         payOrder.setOrderType("2");
@@ -160,6 +160,10 @@ public class PayOrderController {
                         payOrder.setDiscountAmt(Double.valueOf(payOrderResultInfo.getDiscountAmt()));
                         payOrder.setAmt(Double.valueOf(payOrderResultInfo.getAmt()));
                         payOrder.setOrderType("1");
+                        if(payOrderResultInfo.getCardEnabledFlag() !=null && payOrderResultInfo.getCardEnabledFlag().equals("1")){
+                            payOrder.setDzkAmt(Double.valueOf(payOrderResultInfo.getDzkAmt()));
+                            payOrder.setDiscountAmt(Double.valueOf(payOrderResultInfo.getDzkDiscountAmt()));
+                        }
                         resultMap.put("cardEnabledFlag", payOrderResultInfo.getCardEnabledFlag());
                         resultMap.put("oilsCardFlag", payOrderResultInfo.getOilsCardFlag());
                         resultMap.put("discountAmt", payOrderResultInfo.getDiscountAmt());                                          //优惠价格

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

@@ -985,6 +985,7 @@
         A.oil_type              AS oilType,
         A.order_liters 			AS orderLiters,
         A.amt 					AS amt,
+        A.dzk_amt               AS dzkAmt,
         A.order_type 			AS orderType,
         A.oil_pirce             AS oilPirce,
         A.receivable_amt        AS receivableAmt,
@@ -1026,9 +1027,15 @@
         <if test="wxAmt != null">
             wx_amt = #{wxAmt,jdbcType=DOUBLE},
         </if>
+        <if test="discountAmt != null">
+            discount_amt = #{discountAmt,jdbcType=DOUBLE},
+        </if>
         <if test="dzkAmt != null">
             dzk_amt = #{dzkAmt,jdbcType=DOUBLE},
         </if>
+        <if test="amt != null">
+            amt = #{amt,jdbcType=DOUBLE},
+        </if>
         <if test="payDate != null">
           pay_date = #{payDate,jdbcType=TIMESTAMP},
         </if>