修改

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

@@ -404,12 +404,16 @@ public class ElectronicMembershipCardController {
                     payOrder.setStatus("1");
                     payOrder.setPayDate(new Timestamp(new Date().getTime()));    //支付时间
                     payOrder.setReceivedAmt(Double.valueOf(dzkAmt));
+                    //电子卡优惠金额
+                    BigDecimal subtract = new BigDecimal(receivableAmt).subtract(new BigDecimal(dzkAmt));
+                    payOrder.setDiscountAmt(Double.valueOf(subtract.toString()));
+
                     payOrder.setAmt(Double.valueOf(dzkAmt));
                     payOrder.setWxAmt(Double.valueOf("0"));
                     payOrder.setDzkAmt(Double.valueOf(dzkAmt));
                     //payOrder.setTransactionId(ordNo);
                     //BigDecimal discountAmt = new BigDecimal(receivableAmt).subtract(new BigDecimal(dzkAmt));
-                    payOrder.setDiscountAmt(Double.valueOf(discountAmt));
+                    //payOrder.setDiscountAmt(Double.valueOf(discountAmt));
                     payOrderService.getUpdatePayOrder(payOrder);
                     //插入集团客户信息
                     //insertCustomerGroup(resultMap);

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

@@ -149,15 +149,19 @@ public class PayOrderController {
                         payOrder.setDiscountAmt(Double.valueOf(payOrderResultInfo.getDiscountAmt()));
                         payOrder.setAmt(Double.valueOf(payOrderResultInfo.getAmt()));
                         payOrder.setOrderType("1");
+                        resultMap.put("discountPrice", payOrderResultInfo.getDiscountPrice());
                         if(payOrderResultInfo.getCardEnabledFlag() !=null && payOrderResultInfo.getCardEnabledFlag().equals("1")){
                             payOrder.setDzkAmt(Double.valueOf(payOrderResultInfo.getDzkAmt()));
-                            payOrder.setDiscountAmt(Double.valueOf(payOrderResultInfo.getDzkDiscountAmt()));
+                            //如果电子卡支付的金额与应收金额相同，则优惠价格有原有价格相同
+//                            if(new BigDecimal(payOrderRequest.getReceivableAmt()).compareTo(new BigDecimal(payOrderResultInfo.getDzkAmt())) ==0){
+//                                resultMap.put("discountPrice", payOrderResultInfo.getOilPrice());
+//                            }
+                            //payOrder.setDiscountAmt(Double.valueOf(payOrderResultInfo.getDzkDiscountAmt()));
                         }
                         resultMap.put("cardEnabledFlag", payOrderResultInfo.getCardEnabledFlag());
                         resultMap.put("oilsCardFlag", payOrderResultInfo.getOilsCardFlag());
                         resultMap.put("discountAmt", payOrderResultInfo.getDiscountAmt());    //优惠金额
                         resultMap.put("amt", payOrderResultInfo.getAmt());                   //实收价格
-                        resultMap.put("discountPrice", payOrderResultInfo.getDiscountPrice());
                         if(payOrderRequest.getIsLngFlagGroup() !=null && payOrderRequest.getIsLngFlagGroup().equals("1")){
                             payOrder.setSellAmt(Double.valueOf(payOrderResultInfo.getSellAmt()));
                             payOrder.setSellDiscountAmt(Double.valueOf(payOrderResultInfo.getSellDiscountAmt()));