From 7b4cc5f2b1c357fb1bd6a14b4e740af3936fa119 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Fri, 10 Sep 2021 18:27:46 +0800 Subject: [PATCH] fix order --- .../main/java/com/iformall/controller/WxOrderController.java | 2 +- .../java/com/iformall/controller/WxPayOrderController.java | 4 ++-- .../service/order/impl/SingleOrderAdapterService.java | 5 +++++ .../order/impl/batch/CouponPackageOrderAdapterService.java | 3 ++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java index b8e1b6fd6..e2e43f8b7 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java @@ -101,7 +101,7 @@ public class WxOrderController extends BaseController { } @ApiOperation(value = "单个券单个订单,卡(分账导致无法批量下单)、拼团,砍价用", notes = "{\"couponChannelId\":\"String\",\"couponId\":\"String\",\"press\":\"String\",\"orderGroupId\":\"String\",\"formId\":\"String\"}") - @PostMapping("singleSave") + @PostMapping("save") public ResultData saveOrder(@RequestBody OrderSaveDto orderSaveDto) { Long memberId; try { diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java index a466d30ad..a4d831d10 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java @@ -144,12 +144,12 @@ public class WxPayOrderController extends BaseController { } } - @ApiOperation(value = "更新支付订单状态", notes = "{\"payOrderId\":\"string\",\"composeOrderId\":\"string\",\"status\":integer,\"reason\":\"string\"}") + @ApiOperation(value = "更新支付订单状态", notes = "{\"payOrderId\":\"string\",\"orderId\":\"string\",\"status\":integer,\"reason\":\"string\"}") @PostMapping("/updatePayOrder") public ResultData updatePayOrder(@RequestBody Map paramMap) { logger.info("/api/pay/updatePayOrder" + paramMap.toString()); String payOrderIdStr = (String) paramMap.get("payOrderId"); - String orderIdStr = (String) paramMap.get("composeOrderId"); + String orderIdStr = (String) paramMap.get("orderId"); String reasonStr = (String) paramMap.get("reason"); Integer status = (Integer) paramMap.get("status"); if (StringUtils.isBlank(orderIdStr)) { diff --git a/mallinkService/src/main/java/com/iformall/service/order/impl/SingleOrderAdapterService.java b/mallinkService/src/main/java/com/iformall/service/order/impl/SingleOrderAdapterService.java index 26b452e8f..f2bed6882 100644 --- a/mallinkService/src/main/java/com/iformall/service/order/impl/SingleOrderAdapterService.java +++ b/mallinkService/src/main/java/com/iformall/service/order/impl/SingleOrderAdapterService.java @@ -11,6 +11,7 @@ import com.iformall.domain.dto.OrderComposeSaveDto; import com.iformall.domain.po.WxCUserBasicInfo; import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxOrder; +import com.iformall.domain.po.WxPayOrder; import com.iformall.enums.EnumComposeOrder; import com.iformall.enums.EnumPayWay; import com.iformall.mapper.WxOrderMapper; @@ -78,4 +79,8 @@ public class SingleOrderAdapterService implements OrderAdapterService { return coupon.getSubsidyNum(); } + @Override + public void doOthersAfterPaySuccess(WxOrder order, WxPayOrder record) { + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/order/impl/batch/CouponPackageOrderAdapterService.java b/mallinkService/src/main/java/com/iformall/service/order/impl/batch/CouponPackageOrderAdapterService.java index c62b847a9..29f454cec 100644 --- a/mallinkService/src/main/java/com/iformall/service/order/impl/batch/CouponPackageOrderAdapterService.java +++ b/mallinkService/src/main/java/com/iformall/service/order/impl/batch/CouponPackageOrderAdapterService.java @@ -38,7 +38,7 @@ public class CouponPackageOrderAdapterService extends BaseBatchOrderAdapterServi @Override public Integer calcuteChildOrderSubsidy(WxCoupon coupon) { - return coupon.getSubsidyNum(); + return 0; } @Override @@ -49,6 +49,7 @@ public class CouponPackageOrderAdapterService extends BaseBatchOrderAdapterServi @Override public void doOthersAfterPaySuccess(WxOrder order, WxPayOrder record) { //手动核销发券 + } }