Merge remote-tracking branch 'origin/main' into main

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/OtcTradeOrderController.java

@@ -43,6 +43,7 @@ import com.yc.ship.module.trade.service.order.TradeOrderService;
 import com.yc.ship.module.trade.service.order.TradeOrderTotalService;
 import com.yc.ship.module.trade.service.otc.AppOtcTradeOrderService;
 import com.yc.ship.module.trade.service.otc.OtcTradeOrderService;
+import com.yc.ship.module.trade.service.pay.TradeOrderPayService;
 import com.yc.ship.module.trade.utils.AgencyAuthUtils;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -98,6 +99,9 @@ public class OtcTradeOrderController {
     @Resource
     private ShipApi shipApi;
 
+    @Resource
+    private TradeOrderPayService tradeOrderPayService;
+
     @RequestDecryption
     @PostMapping("/window/createOrder")
     @Operation(summary = "win-窗口创建订单(内部)")
@@ -177,6 +181,14 @@ public class OtcTradeOrderController {
         return otcTradeOrderService.queryOrderStatus(orderId);
     }
 
+    @GetMapping("/payOrderQuery")
+    @Operation(summary = "支付反查，0待支付(轮询) 1已支付 2未支付 8888已支付等待结果(轮询) ")
+    @OperateLog(type = TRADE)
+    @PlatTenantEnv
+    public CommonResult<?> payOrderQuery(@RequestParam Long payOrderId){
+        return tradeOrderPayService.payOrderQuery(payOrderId);
+    }
+
     @PostMapping("/window/orderList")
     @OperateLog(type = API)
     @Operation(summary = "win-平台订单列表[分页]", description = "根据条件查询订单列表")
@@ -386,7 +398,13 @@ public class OtcTradeOrderController {
     public CommonResult<List<TradeDetailBaseDO>> getDetailInfo(@Valid @RequestParam("id") Long id) {
         return success(otcTradeOrderService.getDetailInfo(id));
     }
-
+    @PostMapping("/payOuterOrder")
+    @Operation(summary = "外部订单支付")
+    @OperateLog(type = TRADE)
+    public CommonResult<PayOrderRespVO>  payOuterOrder(@Valid @RequestBody PayOrderReqVO payOrderReqVO){
+        CommonResult<PayOrderRespVO> commonResult = tradeOrderPayService.payOuterOrder(payOrderReqVO);
+        return commonResult;
+    }
     @GetMapping("/categoryOrSpu")
     @Operation(summary = "sell-产品分组和产品数据")
     @OperateLog(type = API)

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/pay/impl/TradeOrderPayServiceImpl.java

@@ -750,15 +750,15 @@ public class TradeOrderPayServiceImpl implements TradeOrderPayService {
             Asserts.isTrue(flag,"当前订单已支付，不能重复支付");
         }
 
-        if(ObjectUtil.equal(tradeOrderPayDO.getSellMethod(),PaySourceEnum.STOCK_DIRECT_ORDER.getType())){
-            //如果是定向库存支付
-            Asserts.isTrue(StrUtil.isNotBlank(payOrderReqVO.getAccountId()),"需传递accountId");
-//            Asserts.isTrue(payOrderReqVO.getStoreId()!=null,"门店ID不能为空");
-            //支付方式只能是微信、支付宝、预付款
-            Asserts.isTrue(ObjectUtils.equalsAny(tradeOrderPayDO.getPaymentType(),PayTypeEnum.ADVANCE_PAYMENT.getType()
-                    ,PayTypeEnum.WEIXIN_PAY.getType(),PayTypeEnum.ALI_PAY.getType(),PayTypeEnum.CORPORATE_TRANSFER_PAY.getType()
-                    ,PayTypeEnum.TONG_LIAN_SCAN_PAY.getType()),"当前订单不支持此支付方式");
-        }
+//        if(ObjectUtil.equal(tradeOrderPayDO.getSellMethod(),PaySourceEnum.STOCK_DIRECT_ORDER.getType())){
+//            //如果是定向库存支付
+//            Asserts.isTrue(StrUtil.isNotBlank(payOrderReqVO.getAccountId()),"需传递accountId");
+////            Asserts.isTrue(payOrderReqVO.getStoreId()!=null,"门店ID不能为空");
+//            //支付方式只能是微信、支付宝、预付款
+//            Asserts.isTrue(ObjectUtils.equalsAny(tradeOrderPayDO.getPaymentType(),PayTypeEnum.ADVANCE_PAYMENT.getType()
+//                    ,PayTypeEnum.WEIXIN_PAY.getType(),PayTypeEnum.ALI_PAY.getType(),PayTypeEnum.CORPORATE_TRANSFER_PAY.getType()
+//                    ,PayTypeEnum.TONG_LIAN_SCAN_PAY.getType()),"当前订单不支持此支付方式");
+//        }
 
         if(ObjectUtil.equal(tradeOrderPayDO.getSellMethod(),PaySourceEnum.GUIDE_REFUND_PLAT_CHARGEBACK.getType())){
             //支付方式只能是预付款