Merge branch 'dev_mall_20221201' into online

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

@@ -172,7 +172,7 @@ public class OpenShareController extends BaseController {
     public R<Boolean> productOrderRefund(@PathVariable(name = "id") String orderNo) {
 
         log.info("设置订单退款：{}",orderNo);
-        return R.ok(portalOrderService.jmeduOrderRefund(orderNo));
+        return R.restResult(portalOrderService.jmeduOrderRefund(orderNo), ApiErrorCode.SUCCESS);
     }
 
 
@@ -216,7 +216,7 @@ public class OpenShareController extends BaseController {
     @GetMapping(value = "/product/lockSku/{id}", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
     public R<Boolean> productOrderCourier(@PathVariable(name = "id") Long skuId,@RequestParam("platform") String platform,@RequestParam("lockState") Boolean lockState) {
         log.info("锁定/解锁 skuId : {},platform:{},lockState:{}",skuId,platform,lockState);
-        return R.ok(portalOrderService.lockSku(skuId,platform,lockState));
+        return R.restResult(portalOrderService.lockSku(skuId,platform,lockState), ApiErrorCode.SUCCESS);
 
     }
 }