ソースを参照

web-中台 套餐列表修改

qxy 4 ヶ月 前
コミット
eb230514ea

+ 0 - 3
alien-entity/src/main/java/shop/alien/entity/store/LifeGroupBuyMain.java

@@ -248,7 +248,4 @@ public class LifeGroupBuyMain {
     @TableField("updated_user_id")
     private Integer updatedUserId;
 
-    @ApiModelProperty(value = "审批意见")
-    @TableField("comment")
-    private String comment;
 }

+ 0 - 3
alien-entity/src/main/java/shop/alien/entity/store/vo/LifeGroupBuyThaliVo.java

@@ -253,7 +253,4 @@ public class LifeGroupBuyThaliVo {
     @ApiModelProperty(value = "子信息")
     private List<LifeGroupBuyNameThaliVo> details;
 
-    @ApiModelProperty(value = "审核意见")
-    @TableField("comment")
-    private String comment;
 }

+ 1 - 1
alien-entity/src/main/java/shop/alien/mapper/LifeGroupBuyMainMapper.java

@@ -26,7 +26,7 @@ public interface LifeGroupBuyMainMapper extends BaseMapper<LifeGroupBuyMain> {
             "        disable_date_value,write_off,reservation_rules,use_rules,applicable_num,\n" +
             "        other_rules,invoice_type,invoice_describe,insured_flag,insured_price,\n" +
             "        coupon_id,delete_flag,created_time,updated_time,created_user_id,\n" +
-            "        updated_user_id,comment from life_group_buy_main ${ew.customSqlSegment}")
+            "        updated_user_id from life_group_buy_main ${ew.customSqlSegment}")
     IPage<LifeGroupBuyThaliVo> selectPageByThaliVo(IPage<LifeGroupBuyThaliVo> lifeGroupBuyThaliVoIPage,@Param(Constants.WRAPPER) QueryWrapper<LifeGroupBuyThaliVo> queryWrapper);
 }
 

+ 3 - 3
alien-store/src/main/java/shop/alien/store/controller/LifeGroupBuyController.java

@@ -64,9 +64,9 @@ public class LifeGroupBuyController {
 
     @ApiOperation("修改团购状态")
     @GetMapping("/updateStatus")
-    private R updateStatus(@RequestParam("id") String id, @RequestParam("status") String status, @RequestParam("comment") String comment) {
-        log.info("LifeGroupBuyController.updateStatus?id={},status={},comment={}", id, status, comment);
-        if (lifeGroupBuyService.updateStatus(id, status, comment)) {
+    private R updateStatus(@RequestParam("id") String id, @RequestParam("status") String status, @RequestParam("approvalComments") String approvalComments) {
+        log.info("LifeGroupBuyController.updateStatus?id={},status={},approvalComments={}", id, status, approvalComments);
+        if (lifeGroupBuyService.updateStatus(id, status, approvalComments)) {
             return R.success("成功");
         }
         return R.fail("失败");

+ 1 - 1
alien-store/src/main/java/shop/alien/store/service/LifeGroupBuyService.java

@@ -19,7 +19,7 @@ public interface LifeGroupBuyService extends IService<LifeGroupBuyMain> {
 
     LifeGroupBuyThaliVo getThaliById(String id);
 
-    boolean updateStatus(String id,String status, String comment);
+    boolean updateStatus(String id,String status, String approvalComments);
 
     boolean delThaliById(String id,String groupType);
 

+ 2 - 2
alien-store/src/main/java/shop/alien/store/service/impl/LifeGroupBuyServiceImpl.java

@@ -135,8 +135,8 @@ public class LifeGroupBuyServiceImpl extends ServiceImpl<LifeGroupBuyMainMapper,
     }
 
     @Override
-    public boolean updateStatus(String id, String status, String comment) {
-        lifeGroupBuyMainMapper.update(null, new LambdaUpdateWrapper<LifeGroupBuyMain>().eq(LifeGroupBuyMain::getId, id).set(LifeGroupBuyMain::getStatus, status).set(LifeGroupBuyMain::getComment, comment));
+    public boolean updateStatus(String id, String status, String approvalComments) {
+        lifeGroupBuyMainMapper.update(null, new LambdaUpdateWrapper<LifeGroupBuyMain>().eq(LifeGroupBuyMain::getId, id).set(LifeGroupBuyMain::getStatus, status).set(LifeGroupBuyMain::getApprovalComments, approvalComments));
         return true;
     }