需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/pay/PayOrderController.java

@@ -119,7 +119,7 @@ public class PayOrderController {
 
     @PostMapping("/paid")
     @ApiOperation(value = "扫码支付获得结果")
-    public ResponseHelper<String> paid(
+    public ResponseHelper<WorkerOrder> paid(
             @ApiParam(required = true, value = "订单号") @RequestParam(required = true) String orderId,
             @ApiParam(required = false, value = "扫付款码得到得code") @RequestParam(required = false) String authCode,
             @ApiParam(required = true, value = "WECHAT 微信支付  LINE 线下支付") @RequestParam(required = true) String payType,
@@ -132,7 +132,7 @@ public class PayOrderController {
             }
             String ip = IpUtil.getIpAddr(request);
             payOrderLogic.upIsPay(orderId);
-            String payStatus = payOrderLogic.paid(orderId, authCode, ip, payType);
+            WorkerOrder payStatus = payOrderLogic.paid(orderId, authCode, ip, payType);
 
             return ResponseHelper.success(payStatus);
         } finally {

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/order/PayOrderLogic.java

@@ -463,7 +463,7 @@ public class PayOrderLogic {
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public String paid(String orderId, String authCode,String ip,String payType) throws Exception {
+    public WorkerOrder paid(String orderId, String authCode,String ip,String payType) throws Exception {
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
         WorkerOrder workerOrder = workerOrderService.getById(orderId);
 
@@ -684,7 +684,7 @@ public class PayOrderLogic {
         this.addSettlementOrder(workerOrder,workerOrderItems);
 
 
-        return workerOrder.getOrderId();
+        return workerOrder;
     }
 
     private void makeSubStockData(WorkerOrder workerOrder, List<WorkerOrderItem> workerOrderItems, List<WorkerStockDTO> workerStockDTOS) {