liujunchi преди 3 години
родител
ревизия
cbbaf4d74a

+ 1 - 4
cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/controller/SmsHomeRecommendSubjectController.java

@@ -61,10 +61,7 @@ public class SmsHomeRecommendSubjectController {
     @ResponseBody
     public CommonResult updateRecommendStatus(@RequestParam("ids") List<Long> ids, @RequestParam Integer recommendStatus) {
         int count = recommendSubjectService.updateRecommendStatus(ids, recommendStatus);
-        if (count > 0) {
-            return CommonResult.success(count);
-        }
-        return CommonResult.failed();
+        return CommonResult.success(count);
     }
 
     @ApiOperation("分页查询推荐")

+ 4 - 0
cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/impl/OmsOrderReturnApplyServiceImpl.java

@@ -73,6 +73,10 @@ public class OmsOrderReturnApplyServiceImpl implements OmsOrderReturnApplyServic
     public int delete(List<Long> ids) {
         OmsOrderReturnApplyExample example = new OmsOrderReturnApplyExample();
         example.createCriteria().andIdIn(ids).andStatusEqualTo(3);
+        List<OmsOrderReturnApply> omsOrderReturnApplies = returnApplyMapper.selectByExample(example);
+        if (omsOrderReturnApplies.size() != ids.size()) {
+            throw new BizException("只能删除已拒绝的退货订单");
+        }
         return returnApplyMapper.deleteByExample(example);
     }