支付宝支付修改

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

@@ -1549,6 +1549,12 @@ public class PayController {
             String payDate = sdf.format(infoMap.get("payDate"));
             m.put("payDate", payDate);
         }
+        if(infoMap !=null && infoMap.containsKey("mobilePhone") && infoMap.get("mobilePhone") !=null){
+            String phone =infoMap.get("mobilePhone")+"";
+            //手机号中间四位****代替
+            phone = phone.substring(0, 3) + "****" + phone.substring(7, phone.length());
+            m.put("mobilePhone", phone);
+        }
         if(infoMap !=null && infoMap.containsKey("payType") && infoMap.get("payType") !=null){
             String payType = "";
             if(infoMap.get("payType").equals("wx")){
@@ -1557,14 +1563,18 @@ public class PayController {
             if(infoMap.get("payType").equals("dzk")){
                 payType ="电子卡";
             }
+            if(infoMap.get("payType").equals("zfb")){
+                payType ="支付宝";//consumer
+                if(infoMap !=null && infoMap.containsKey("consumer") && infoMap.get("consumer") !=null){
+                    String phone =infoMap.get("consumer")+"";
+                    //手机号中间四位****代替
+                    phone = phone.substring(0, 3) + "****" + phone.substring(7, phone.length());
+                    m.put("mobilePhone", phone);
+                }
+            }
             m.put("payType", payType);
         }
-        if(infoMap !=null && infoMap.containsKey("mobilePhone") && infoMap.get("mobilePhone") !=null){
-            String phone =infoMap.get("mobilePhone")+"";
-            //手机号中间四位****代替
-            phone = phone.substring(0, 3) + "****" + phone.substring(7, phone.length());
-            m.put("mobilePhone", phone);
-        }
+
         if(infoMap !=null && infoMap.containsKey("orderLiters") && infoMap.get("orderLiters") !=null){
             m.put("orderLiters", infoMap.get("orderLiters").toString());
         }
@@ -1708,8 +1718,16 @@ public class PayController {
         if(infoMap.containsKey("payType") && infoMap.get("payType") !=null ){
             if(infoMap.get("payType").equals("wx")){
                 payWayP ="微信";
-            }else {
+            }else if(infoMap.get("payType").equals("dzk")){
                 payWayP ="电子卡";
+            }else {
+                payWayP ="支付宝";
+                //支付宝支付 用户名就是客户手机号
+                if(infoMap.containsKey("consumer") && infoMap.get("consumer") !=null ){
+                    String phone =infoMap.get("consumer")+"";
+                    //手机号中间四位****代替
+                    mobilePhoneP = phone.substring(0, 3) + "****" + phone.substring(7, phone.length());
+                }
             }
 
         }

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

@@ -2237,6 +2237,11 @@ public class PayOrderController {
             resultMap.put("cardOilsType", oilInfo.getOilsType());
             String oilsType = oilInfo.getOilsType();                                        //获取订单类型
             logger.info("订单油品类型：" + oilsType);
+            if(oilsType.equals("3")) {                                                       //订单类型是油品时计算
+                payOrder.setOrderType("2");
+            }else {
+                payOrder.setOrderType("1");
+            }
             payOrder.setOilName(oilName);                                                   //油品名称
             payOrder.setAmt(Double.valueOf(payOrderRequest.getReceivableAmt()));
             payOrder.setDiscountAmt(Double.valueOf("0.00"));