修改

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

@@ -7,6 +7,7 @@ import com.platform.yijia.utils.CodeMsg;
 import com.platform.yijia.utils.ResultData;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -52,6 +53,7 @@ public class IntegralOrderController {
     //生成积分订单
     @RequestMapping(value = "/insertIntegralOrder", method = RequestMethod.GET)
     @ResponseBody
+    @Transactional
     public String insertIntegralOrder(@RequestParam IntegralOrder request){
         Gson gson =new Gson();
         //返回结果集

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

@@ -201,7 +201,8 @@ public class PayController {
 
                     //reqData.put("outFrontUrl", ""); //js 支付，前台 成功通知地址
                     //reqData.put("outFrontFailUrl", ""); //js 支付，前台 事变通知地址
-                    reqData.put("notifyUrl", "https://www.huijy.net/api/getCallback"); //回调地址
+                    //reqData.put("notifyUrl", "https://www.huijy.net/api/getCallback"); //回调地址
+                    reqData.put("notifyUrl", "https://www.huijy.net/demo/getCallback"); //回调地址
                     //reqData.put("needReceipt", "00"); //电子发票功能 微信开具电子 发票使用
                     //reqData.put("ledgerAccountFlag", "00"); //是否做分账 分账交易使 用；00：做； 01：不做；不传默认为不做分账
                     //reqData.put("ledgerAccountEffectTime", "00"); //分账有效时间 单位为天；是 否做分账选择 00 时该字段必传
@@ -598,11 +599,13 @@ public class PayController {
                                 }else {
                                     customerManage.setAmt(BigDecimal.valueOf((Double) infoMap.get("amt")));
                                 }
-                                if(existCustomer.getLiters() !=null){
-                                    //存入升数 累加原来升数
-                                    customerManage.setLiters(existCustomer.getLiters().add(BigDecimal.valueOf((Double) infoMap.get("orderLiters"))));
-                                }else {
-                                    customerManage.setLiters(BigDecimal.valueOf((Double) infoMap.get("orderLiters")));
+                                if(infoMap.containsKey("orderType") && infoMap.get("orderType").equals("1")) {
+                                    if (existCustomer.getLiters() != null) {
+                                        //存入升数 累加原来升数
+                                        customerManage.setLiters(existCustomer.getLiters().add(BigDecimal.valueOf((Double) infoMap.get("orderLiters"))));
+                                    } else {
+                                        customerManage.setLiters(BigDecimal.valueOf((Double) infoMap.get("orderLiters")));
+                                    }
                                 }
                                 logger.info("存在客户 更新时手机号参数: " + customerManage.getPhoneNumber());
 
@@ -638,7 +641,10 @@ public class PayController {
                                     logger.info("直降等级信息是否存入客户表："+ "直降ID："+ customerManage.getMemberGrade()+ "直降名称： "+customerManage.getGrade());
                                 }
                                 customerManage.setAmt(BigDecimal.valueOf((Double) infoMap.get("amt")));    //存入金额
-                                customerManage.setLiters(BigDecimal.valueOf((Double) infoMap.get("orderLiters")));    //存入升数
+                                if(infoMap.containsKey("orderType") && infoMap.get("orderType").equals("1")){
+                                    customerManage.setLiters(BigDecimal.valueOf((Double) infoMap.get("orderLiters")));    //存入升数
+                                }
+
                                 //不存在 新增
                                 logger.info("不存在客户 新增时参数: " + customerManage.toString());
                                 payOrderService.insertCustomer(customerManage);
@@ -756,20 +762,28 @@ public class PayController {
                             if(infoMap.containsKey("oilName") && infoMap.get("oilName") !=null ){
                                 oilNameP =infoMap.get("oilName").toString();
                             }
-                            //加油升数
-                            if(infoMap.containsKey("orderLiters") && infoMap.get("orderLiters") !=null ){
-                                orderLitersP =infoMap.get("orderLiters")+"";
-                            }
-                            //油价
-                            if(infoMap.containsKey("oilPirce") && infoMap.get("oilPirce") !=null ){
-                                oilPirceP =infoMap.get("oilPirce")+"";
+                            if(infoMap.containsKey("orderType") && infoMap.get("orderType").equals("1")) {
+                                //加油升数
+                                if (infoMap.containsKey("orderLiters") && infoMap.get("orderLiters") != null) {
+                                    orderLitersP = infoMap.get("orderLiters") + "";
+                                }
+                                //油价
+                                if (infoMap.containsKey("oilPirce") && infoMap.get("oilPirce") != null) {
+                                    oilPirceP = infoMap.get("oilPirce") + "";
+                                }
+                                if(infoMap.containsKey("discountAmt") && infoMap.get("discountAmt") !=null ){
+                                    discountAmtP =infoMap.get("discountAmt")+"";
+                                }
+                            }else if(infoMap.containsKey("orderType") && infoMap.get("orderType").equals("2")) {
+                                orderLitersP ="0.00";
+                                oilPirceP = "0.00";
+                                discountAmtP ="0.00";
+                                receivableAmtP=infoMap.get("amt")+"";
                             }
                             if(infoMap.containsKey("receivableAmt") && infoMap.get("receivableAmt") !=null ){
                                 receivableAmtP =infoMap.get("receivableAmt")+"";
                             }
-                            if(infoMap.containsKey("discountAmt") && infoMap.get("discountAmt") !=null ){
-                                discountAmtP =infoMap.get("discountAmt")+"";
-                            }
+
                             if(infoMap.containsKey("amt") && infoMap.get("amt") !=null ){
                                 amtP =infoMap.get("amt")+"";
                             }