From 1308c0bebbea38227e8c48b8921a1c458e66a2e4 Mon Sep 17 00:00:00 2001 From: Sum1Dream <418471657@qq.com> Date: Tue, 19 Sep 2023 11:19:33 +0800 Subject: [PATCH] 1 --- .../com/cweb/controller/Goods/GoodsController.java | 1 - .../java/com/web/controller/OrderPayController.java | 2 +- .../java/com/hai/order/service/OrderPayService.java | 2 +- .../hai/order/service/impl/OrderPayServiceImpl.java | 13 ++++++++++--- .../java/com/v1/controller/WxMsgController.java | 4 ++-- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/hai-cweb/src/main/java/com/cweb/controller/Goods/GoodsController.java b/hai-cweb/src/main/java/com/cweb/controller/Goods/GoodsController.java index 3f8eb9df..5ea3ff75 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/Goods/GoodsController.java +++ b/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) { diff --git a/hai-order/src/main/java/com/web/controller/OrderPayController.java b/hai-order/src/main/java/com/web/controller/OrderPayController.java index a84b2c46..fee3f758 100644 --- a/hai-order/src/main/java/com/web/controller/OrderPayController.java +++ b/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, "未知的卡号类型"); diff --git a/hai-service/src/main/java/com/hai/order/service/OrderPayService.java b/hai-service/src/main/java/com/hai/order/service/OrderPayService.java index ffda7e69..1f280e9e 100644 --- a/hai-service/src/main/java/com/hai/order/service/OrderPayService.java +++ b/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 diff --git a/hai-service/src/main/java/com/hai/order/service/impl/OrderPayServiceImpl.java b/hai-service/src/main/java/com/hai/order/service/impl/OrderPayServiceImpl.java index 1c8bc899..2833f851 100644 --- a/hai-service/src/main/java/com/hai/order/service/impl/OrderPayServiceImpl.java +++ b/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) { - if (StringUtils.isNotBlank(carLicensePlate)) { + public HighOrder oilCardFleetPay(HighOrder order, HighUserCard userCard, String carLicensePlate , String phone) { + 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 consumeMap = new HashMap<>(); consumeMap.put("sourceType", OilCardRecordSourceTypeEnum.type2.getType()); diff --git a/v1/src/main/java/com/v1/controller/WxMsgController.java b/v1/src/main/java/com/v1/controller/WxMsgController.java index b47f7cb9..5c99c5a4 100644 --- a/v1/src/main/java/com/v1/controller/WxMsgController.java +++ b/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" - + "查看中石油操作流程\n\n" + + "查看中石油操作流程\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" - + "查看中石油操作流程\n\n" + + "查看中石油操作流程\n\n" + "走得更远，看得更美的风景，加油添生活！[太阳]\n\n" + "好车要好油,优惠更加牛！[發]\n\n"; }