From abf7640c09522bf16dfbd9457d8927ea77edb78b Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Mon, 28 Apr 2025 13:34:22 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A9=BF=E7=AB=99=E4=BB=98=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canteen/core/order/common/dto/RequestHeaderDTO.java    | 3 ---
 .../business/impl/OrderPlaceMobileBusinessImplV3.java      | 6 +++---
 .../mobile/controller/OrderPlaceMobileController.java      | 7 +------
 .../canteen/core/order/mobile/dto/StagePayMobileDTO.java   | 5 +++++
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/common/dto/RequestHeaderDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/common/dto/RequestHeaderDTO.java
index ad40cfa9..a1a1a82f 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/common/dto/RequestHeaderDTO.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/common/dto/RequestHeaderDTO.java
@@ -17,11 +17,8 @@ public class RequestHeaderDTO {
       if (MapUtil.isEmpty(requestHeader)) {
          return headerDTO;
       } else {
-         headerDTO.setOpenid(HeaderFetchUtil.getOpenid(requestHeader));
-         headerDTO.setSourceType(HeaderFetchUtil.getSourceType(requestHeader));
          headerDTO.setMachineNum(HeaderFetchUtil.getMachineNum(requestHeader));
          headerDTO.setMachineSn(HeaderFetchUtil.getMachineSn(requestHeader));
-         headerDTO.setCustId(HeaderFetchUtil.getCustId(requestHeader));
          return headerDTO;
       }
    }
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mobile/business/impl/OrderPlaceMobileBusinessImplV3.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mobile/business/impl/OrderPlaceMobileBusinessImplV3.java
index 7bb3cb8a..2d1d774c 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mobile/business/impl/OrderPlaceMobileBusinessImplV3.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mobile/business/impl/OrderPlaceMobileBusinessImplV3.java
@@ -335,13 +335,13 @@ public class OrderPlaceMobileBusinessImplV3 implements OrderPlaceMobileBusiness
 
    @Override
    public UnifyPayVO stageOrderPay(RequestHeaderDTO headerDTO, StagePayMobileDTO stagePayDTO) {
-      CustPayVO custInfo = this.getCustInfo(stagePayDTO.getCustId(), headerDTO.getSourceType());
+      CustPayVO custInfo = this.getCustInfo(stagePayDTO.getCustId(), stagePayDTO.getSourceType());
       UnifyPayDTO unifyPayDTO = this.createPay(stagePayDTO.getPayType(),
               stagePayDTO.getCouponId(),
-              headerDTO.getSourceType(),
+              stagePayDTO.getSourceType(),
               null,
                null,
-              headerDTO.getOpenid(),
+              stagePayDTO.getOpenid(),
               custInfo,
               stagePayDTO);
       unifyPayDTO.setAmount(stagePayDTO.getAmount());
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mobile/controller/OrderPlaceMobileController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mobile/controller/OrderPlaceMobileController.java
index eca1956c..a090bdf2 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mobile/controller/OrderPlaceMobileController.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mobile/controller/OrderPlaceMobileController.java
@@ -143,10 +143,6 @@ public class OrderPlaceMobileController {
    )
    public AjaxResult stageOrderPay(@RequestHeader Map<String, String> headers,
                                        @RequestBody StagePayMobileDTO stagePayDTO) {
-      String sign = HeaderFetchUtil.getSign(headers);
-      if(StringUtils.isBlank(sign) || !sign.equals(StageWhiteList.STAGE_SIGN_WHITE_LIST)) {
-         return AjaxResult.error("签名失败");
-      }
       if(stagePayDTO.getAmount() == null) {
          return AjaxResult.error("金额不能为空");
       }
@@ -157,7 +153,6 @@ public class OrderPlaceMobileController {
       try{
          long startTime = System.currentTimeMillis();
          RequestHeaderDTO headerDTO = RequestHeaderDTO.of(headers);
-         stagePayDTO.setCustId(headerDTO.getCustId());
          stagePayDTO.setPayType(PayTypeEnum.MEAL_CARD.getKey());
          mobileVO = this.orderPlaceMobileBusiness.stageOrderPay(headerDTO, stagePayDTO);
          LogUtil.info("[驿站支付]支付耗时", System.currentTimeMillis() - startTime, mobileVO);
@@ -167,7 +162,7 @@ public class OrderPlaceMobileController {
       }
       return AjaxResult.success(mobileVO);
    }
-//
+
 //   @PostMapping({"/mixPay/by/orderId"})
 //   @ApiOperation(
 //      value = "根据交易id混合支付",
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mobile/dto/StagePayMobileDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mobile/dto/StagePayMobileDTO.java
index 8a0a2607..0394c448 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mobile/dto/StagePayMobileDTO.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/mobile/dto/StagePayMobileDTO.java
@@ -16,4 +16,9 @@ public class StagePayMobileDTO extends OrderPayMobileDTO{
    @ApiModelProperty("支付金额")
    private @NotNull(message = "支付金额不能为空") @Min(value = 0L, message = "金额不能小于0") BigDecimal amount;
 
+   @ApiModelProperty("openid")
+   private String openid;
+
+   @ApiModelProperty("sourceType")
+   private Integer sourceType;
 }