fix:优惠券重新支付

mec-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/controller/open/OpenShareController.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.portal.controller.open;
 
 import com.ym.mec.common.controller.BaseController;
+import com.yonge.cooleshow.mall.common.api.CommonResult;
 import com.yonge.cooleshow.portal.dto.StockOperateModel;
 import com.yonge.cooleshow.portal.service.PmsPortalProductService;
 import io.swagger.annotations.Api;
@@ -43,8 +44,9 @@ public class OpenShareController extends BaseController {
     @ApiOperation(value = "同步库存")
     @PostMapping(value="/updateStock/{stockType}")
     @ResponseBody
-    public void updateStock(@RequestBody List<StockOperateModel> model, @PathVariable String stockType) {
+    public CommonResult<String> updateStock(@RequestBody List<StockOperateModel> model, @PathVariable String stockType) {
         // 库存操作 stockType  add:添加   reduce:减少  lock:锁定  unlock:解锁
         portalProductService.reduceStock(model,stockType);
+        return CommonResult.success("");
     }
 }

mec-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/OmsPortalOrderServiceImpl.java

@@ -152,7 +152,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
                 userOrderPayment.setCreateTime(new Date());
                 userOrderPaymentService.saveOrUpdate(userOrderPayment);
 
-                return feignMecCreateOrder(order.getCouponId(), oldOrderNo, orderSn, null, detail.getMemberId().intValue(), detail.getTotalAmount(),
+                return feignMecCreateOrder(detail.getCouponId(), oldOrderNo, orderSn, null, detail.getMemberId().intValue(), detail.getTotalAmount(),
                        JSON.toJSONString(detail),detail.getPayType()!= null && detail.getPayType() == 3);
             } else {
                 throw new BizException("订单信息获取失败");