1

hai-cweb/src/main/java/com/cweb/controller/Goods/GoodsController.java

@@ -117,7 +117,6 @@ public class GoodsController {
                 goodsModels = goodsModels.stream().sorted(Comparator.comparing(GoodsModel::getPrice).reversed()).collect(Collectors.toList());
             }
 
-
             return ResponseMsgUtil.success(PageUtil.initPageInfoObj(pageNum, goodsModels.size(), pageSize, new PageInfo<>(goodsModels)));
 
         } catch (Exception e) {

hai-order/src/main/java/com/web/controller/OrderPayController.java

@@ -421,7 +421,7 @@ public class OrderPayController {
                 return ResponseMsgUtil.success(orderPayService.oilCardPay(order, userCard));
 
             } else if (userCard.getType().equals(UserCardType.type3.getType())) {
-                return ResponseMsgUtil.success(orderPayService.oilCardFleetPay(order, userCard, body.getString("carLicensePlate")));
+                return ResponseMsgUtil.success(orderPayService.oilCardFleetPay(order, userCard, body.getString("carLicensePlate") , body.getString("phone")));
 
             } else {
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的卡号类型");

hai-service/src/main/java/com/hai/order/service/OrderPayService.java

@@ -35,7 +35,7 @@ public interface OrderPayService {
      * @param userCard  用户卡号
      * @return
      */
-    HighOrder oilCardFleetPay(HighOrder order, HighUserCard userCard, String carLicensePlate);
+    HighOrder oilCardFleetPay(HighOrder order, HighUserCard userCard, String carLicensePlate , String phone);
 
     /**
      * @Author Sum1Dream

hai-service/src/main/java/com/hai/order/service/impl/OrderPayServiceImpl.java

@@ -131,17 +131,24 @@ public class OrderPayServiceImpl implements OrderPayService {
     }
 
     @Override
-    public HighOrder oilCardFleetPay(HighOrder order, HighUserCard userCard, String carLicensePlate) {
+    public HighOrder oilCardFleetPay(HighOrder order, HighUserCard userCard, String carLicensePlate , String phone) {
-        if (StringUtils.isNotBlank(carLicensePlate)) {
+        if (StringUtils.isNotBlank(carLicensePlate) || StringUtils.isNotBlank(phone)) {
             // 加油订单
             HighGasOrder gasOrder = gasOrderService.getDetailByOrderNo(order.getOrderNo());
             if (gasOrder == null) {
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未找到加油订单");
             }
-            gasOrder.setGasCarLicensePlate(carLicensePlate);
+            if (StringUtils.isNotBlank(carLicensePlate)) {
+                gasOrder.setGasCarLicensePlate(carLicensePlate);
+            }
+            if (StringUtils.isNotBlank(phone)) {
+                gasOrder.setMemPhone(phone);
+            }
+
             gasOrderService.updateGasOrder(gasOrder);
         }
 
+
         // 油卡扣款
         Map<String, Object> consumeMap = new HashMap<>();
         consumeMap.put("sourceType", OilCardRecordSourceTypeEnum.type2.getType());

v1/src/main/java/com/v1/controller/WxMsgController.java

@@ -180,7 +180,7 @@ public class WxMsgController {
                             if ( Objects.equals(object.getString("code"), "1")) {
                                 linkContent =
                                         "加油优惠选我们，你的出行不再忧愁\uD83D\uDC97\n\n"
-                                                + "<a href='https://mp.weixin.qq.com/s/Il-r_ZfTZOQDyQWgfnck1A'>查看中石油操作流程</a>\n\n"
+                                                + "<a href='https://mp.weixin.qq.com/s?__biz=MzU0ODgyNjIzMQ==&mid=2247496512&idx=2&sn=da73b7c417ac29cd39807bb52eedcb7e&chksm=fbbb8e58cccc074e4f03f3dfdef7569a24e75a8db8f19f6f471b7fc9f786bf3e67eb4718ef4d&from=industrynews&version=4.1.9.6038&platform=win#rd'>查看中石油操作流程</a>\n\n"
                                                 + "走得更远，看得更美的风景，加油添生活！[太阳]\n\n"
                                                 + "好车要好油,优惠更加牛！[發]\n\n";
                             }
@@ -310,7 +310,7 @@ public class WxMsgController {
                             if ( Objects.equals(object.getString("code"), "1")) {
                                 linkContent =
                                         "加油优惠选我们，你的出行不再忧愁\uD83D\uDC97\n\n"
-                                                + "<a href='https://mp.weixin.qq.com/s/Il-r_ZfTZOQDyQWgfnck1A'>查看中石油操作流程</a>\n\n"
+                                                + "<a href='https://mp.weixin.qq.com/s?__biz=MzU0ODgyNjIzMQ==&mid=2247496512&idx=2&sn=da73b7c417ac29cd39807bb52eedcb7e&chksm=fbbb8e58cccc074e4f03f3dfdef7569a24e75a8db8f19f6f471b7fc9f786bf3e67eb4718ef4d&from=industrynews&version=4.1.9.6038&platform=win#rd'>查看中石油操作流程</a>\n\n"
                                                 + "走得更远，看得更美的风景，加油添生活！[太阳]\n\n"
                                                 + "好车要好油,优惠更加牛！[發]\n\n";
                             }