+admin.log.operator;

liquidnet-bus-api/liquidnet-service-candy-api/src/main/java/com/liquidnet/service/candy/dto/admin/CandyMgtCouponBuildParam.java

@@ -3,14 +3,12 @@ package com.liquidnet.service.candy.dto.admin;
 import com.liquidnet.commons.lang.constant.LnsRegex;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 
 import javax.validation.constraints.*;
 import java.math.BigDecimal;
 import java.util.List;
 
 @ApiModel(value = "CandyMgtCouponBuildParam", description = "新建券入参")
-@Data
 public class CandyMgtCouponBuildParam {
     //private String couponId;
     //private Integer state;
@@ -66,8 +64,9 @@ public class CandyMgtCouponBuildParam {
     private List<CandyCouponRuleBuildParam> couponRuleList;
 
 
-    //private String mcouponId;
-    //private String couponId;
+    @ApiModelProperty(required = false, value = "发放ID", example = "1")
+    private String mcouponId;
+//    private String couponId;
     //private Integer state;
     @NotNull(message = "券发放量不能为空")
     @Min(value = 1, message = "发放量不能小于1")
@@ -84,4 +83,157 @@ public class CandyMgtCouponBuildParam {
     //private LocalDateTime createdAt;
     //private LocalDateTime updatedAt;
     //private String comment;
+
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        this.label = label;
+    }
+
+    public String getNotice() {
+        return notice;
+    }
+
+    public void setNotice(String notice) {
+        this.notice = notice;
+    }
+
+    public Integer getBusiType() {
+        return busiType;
+    }
+
+    public void setBusiType(Integer busiType) {
+        this.busiType = busiType;
+    }
+
+    public Integer getCouType() {
+        return couType;
+    }
+
+    public void setCouType(Integer couType) {
+        this.couType = couType;
+    }
+
+    public Integer getBindType() {
+        return bindType;
+    }
+
+    public void setBindType(Integer bindType) {
+        this.bindType = bindType;
+    }
+
+    public BigDecimal getDiscount() {
+        return discount;
+    }
+
+    public void setDiscount(BigDecimal discount) {
+        this.discount = discount;
+    }
+
+    public BigDecimal getValFace() {
+        return valFace;
+    }
+
+    public void setValFace(BigDecimal valFace) {
+        this.valFace = valFace;
+    }
+
+    public BigDecimal getValOver() {
+        return valOver;
+    }
+
+    public void setValOver(BigDecimal valOver) {
+        this.valOver = valOver;
+    }
+
+    public BigDecimal getValMinus() {
+        return valMinus;
+    }
+
+    public void setValMinus(BigDecimal valMinus) {
+        this.valMinus = valMinus;
+    }
+
+    public Integer getOverlay() {
+        return overlay;
+    }
+
+    public void setOverlay(Integer overlay) {
+        this.overlay = overlay;
+    }
+
+    public Integer getValidity() {
+        return validity;
+    }
+
+    public void setValidity(Integer validity) {
+        this.validity = validity;
+    }
+
+    public Integer getRedeemValidity() {
+        return redeemValidity;
+    }
+
+    public void setRedeemValidity(Integer redeemValidity) {
+        this.redeemValidity = redeemValidity;
+    }
+
+    public List<CandyCouponRuleBuildParam> getCouponRuleList() {
+        return couponRuleList;
+    }
+
+    public void setCouponRuleList(List<CandyCouponRuleBuildParam> couponRuleList) {
+        this.couponRuleList = couponRuleList;
+    }
+
+    public String getMcouponId() {
+        return mcouponId;
+    }
+
+    public void setMcouponId(String mcouponId) {
+        this.mcouponId = mcouponId;
+    }
+
+    public Integer getEventAmt() {
+        return eventAmt;
+    }
+
+    public void setEventAmt(Integer eventAmt) {
+        this.eventAmt = eventAmt;
+    }
+
+    public Integer getEventType() {
+        return eventType;
+    }
+
+    public void setEventType(Integer eventType) {
+        this.eventType = eventType;
+    }
+
+    public String getEventLimit() {
+        return eventLimit;
+    }
+
+    public void setEventLimit(String eventLimit) {
+        this.eventLimit = eventLimit;
+    }
+
+    public String getEventAt() {
+        return eventAt;
+    }
+
+    public void setEventAt(String eventAt) {
+        this.eventAt = eventAt;
+    }
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamMemberAdminController.java

@@ -3,9 +3,11 @@ package com.liquidnet.client.admin.web.controller.zhengzai.adam;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.liquidnet.client.admin.common.annotation.Log;
 import com.liquidnet.client.admin.common.core.controller.BaseController;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
+import com.liquidnet.client.admin.common.enums.BusinessType;
 import com.liquidnet.client.admin.common.utils.ShiroUtils;
 import com.liquidnet.client.admin.common.utils.poi.ExcelUtil;
 import com.liquidnet.client.admin.zhengzai.adam.dto.AdamMemberCodeExcelDto;
@@ -45,7 +47,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-@Api(tags = "登登登会员")
+@Api(tags = "会员管理")
 @Controller
 @RequestMapping("adam/member")
 public class AdamMemberAdminController extends BaseController {
@@ -79,6 +81,7 @@ public class AdamMemberAdminController extends BaseController {
     }
 
     @RequiresPermissions("adam:member:view:list")
+    @Log(title = "会员管理:会员卡:列表", businessType = BusinessType.LIST)
     @PostMapping("list")
     @ResponseBody
     public TableDataInfo list() {
@@ -91,6 +94,7 @@ public class AdamMemberAdminController extends BaseController {
     }
 
     @RequiresPermissions("adam:member:view:edit")
+    @Log(title = "会员管理:会员卡:详情", businessType = BusinessType.DETAIL)
     @GetMapping("info/{memberId}")
     public String info(@PathVariable("memberId") String memberId, ModelMap mmap) {
         AdamMember member = adamMemberService.getOne(Wrappers.lambdaQuery(AdamMember.class)
@@ -156,6 +160,7 @@ public class AdamMemberAdminController extends BaseController {
 
     @ApiOperation(value = "会员设置:基础信息编辑")
     @RequiresPermissions("adam:member:edit:basic")
+    @Log(title = "会员管理:会员卡编辑:基础信息", businessType = BusinessType.UPDATE)
     @PostMapping("edit_basic")
     @ResponseBody
     public AjaxResult editBasic(@Validated AdamMemberBuildParam parameter) {
@@ -164,6 +169,7 @@ public class AdamMemberAdminController extends BaseController {
 
     @ApiOperation(value = "会员套餐:价格编辑")
     @RequiresPermissions("adam:member:edit:price")
+    @Log(title = "会员管理:会员卡编辑:价格配置", businessType = BusinessType.UPDATE)
     @PostMapping("edit_price")
     @ResponseBody
     public AjaxResult editPrice(@Validated AdamMemberPriceBuildParam parameter) {
@@ -172,6 +178,7 @@ public class AdamMemberAdminController extends BaseController {
 
     @ApiOperation(value = "会员套餐:权益编辑")
     @RequiresPermissions("adam:member:edit:rights")
+    @Log(title = "会员管理:会员卡编辑:权益", businessType = BusinessType.UPDATE)
     @PostMapping("edit_rights")
     @ResponseBody
     public AjaxResult editRights(@Validated AdamMemberRightsBuildParam parameter) {
@@ -186,6 +193,7 @@ public class AdamMemberAdminController extends BaseController {
 
     @ApiOperation(value = "会员套餐:券编辑")
     @RequiresPermissions("adam:member:edit:coupon")
+    @Log(title = "会员管理:会员卡编辑:权益券", businessType = BusinessType.UPDATE)
     @PostMapping("edit_coupon")
     @ResponseBody
     public AjaxResult editCoupon(@RequestBody @Validated CandyMemberCouponBuildParam parameter) {
@@ -240,6 +248,7 @@ public class AdamMemberAdminController extends BaseController {
 
     @ApiOperation(value = "会员码:列表")
     @RequiresPermissions("adam:member:list:code")
+    @Log(title = "会员管理:会员码:列表", businessType = BusinessType.LIST)
     @PostMapping("list_code")
     @ResponseBody
     public TableDataInfo listCode(AdamMemberCodeListParam parameter) {
@@ -273,6 +282,7 @@ public class AdamMemberAdminController extends BaseController {
 
     @ApiOperation(value = "会员码:导出")
     @RequiresPermissions("adam:member:export:code")
+    @Log(title = "会员管理:会员码:导出", businessType = BusinessType.EXPORT)
     @PostMapping("export_code")
     @ResponseBody
     public AjaxResult exportCode(AdamMemberCodeListParam parameter) {
@@ -288,6 +298,7 @@ public class AdamMemberAdminController extends BaseController {
 
     @ApiOperation(value = "会员码:生成")
     @RequiresPermissions("adam:member:gen:code")
+    @Log(title = "会员管理:会员码:生成", businessType = BusinessType.INSERT)
     @PostMapping("gen_code")
     @ResponseBody
     public AjaxResult genCode(@Validated AdamMemberCodeGenParam parameter) {
@@ -305,6 +316,7 @@ public class AdamMemberAdminController extends BaseController {
     }
 
     @RequiresPermissions("adam:member:invalid:code")
+    @Log(title = "会员管理:会员码:失效", businessType = BusinessType.UPDATE)
     @PostMapping("invalid_code")
     @ResponseBody
     public AjaxResult invalid(AdamMemberCodeOptParam optParam) {
@@ -345,75 +357,10 @@ public class AdamMemberAdminController extends BaseController {
     }
 
     @RequiresPermissions("adam:member:recover:code")
+    @Log(title = "会员管理:会员码:退回", businessType = BusinessType.UPDATE)
     @PostMapping("recover_code")
     @ResponseBody
     public AjaxResult recover(AdamMemberCodeOptParam optParam) {
         return toAjax(this.invalidRecoverCode(optParam, 5));
     }
-
-
-//    @Log(title = "会员信息", businessType = BusinessType.LIST)
-//    @RequiresPermissions("adam:member:list")
-//    @ApiOperation(value = "会员卡列表")
-//    @PostMapping("list")
-//    public ResponseDto<List<AdamMemberVo>> list() {
-//        List<AdamMember> list = adamMemberService.list(
-//                Wrappers.lambdaQuery(AdamMember.class).select(
-//                        AdamMember::getMemberId, AdamMember::getName, AdamMember::getTitle, AdamMember::getType, AdamMember::getState
-//                )
-//        );
-//        List<AdamMemberVo> vos = new ArrayList<>();
-//        list.forEach(r -> {
-//            vos.add(AdamMemberVo.getNew().copy(r));
-//        });
-//        return ResponseDto.success(vos);
-//    }
-//
-//    @Log(title = "会员信息", businessType = BusinessType.INSERT)
-//    @RequiresPermissions("adam:member:add")
-//    @ApiOperation(value = "添加会员卡")
-//    @PostMapping("add")
-//    public ResponseDto<Object> add(@Valid @RequestBody AdamMemberParam parameter) {
-//        adamMemberService.add(parameter);
-//        return ResponseDto.success();
-//    }
-//
-//    @Log(title = "会员信息", businessType = BusinessType.DETAIL)
-//    @RequiresPermissions("adam:member:info")
-//    @ApiOperation(value = "会员卡详情")
-//    @PostMapping("info")
-//    public ResponseDto<Object> info(@NotBlank(message = "会员类型ID不能为空") @RequestParam String memberId) {
-//        return ResponseDto.success(adamMemberService.getOne(
-//                Wrappers.lambdaQuery(AdamMember.class).eq(AdamMember::getMemberId, memberId)
-//        ));
-//    }
-//
-//    @Log(title = "会员信息", businessType = BusinessType.UPDATE)
-//    @RequiresPermissions("adam:member:edit")
-//    @ApiOperation(value = "会员卡编辑")
-//    @PostMapping("edit")
-//    public ResponseDto<Object> edit(@Valid @RequestBody AdamMemberParam parameter) {
-//        adamMemberService.edit(parameter);
-//        return ResponseDto.success();
-//    }
-//
-//    @Log(title = "会员信息", businessType = BusinessType.MEMBER_GEN_CODE)
-//    @RequiresPermissions("adam:member:gen_code")
-//    @ApiOperation(value = "生成兑换码")
-//    @PostMapping("gen_code")
-//    public ResponseDto<String> genMemberCode(@Valid @RequestBody AdamMemberCodeParam parameter) {
-//        if (1 != parameter.getType()) {
-//            return ResponseDto.failure("参数有误[TYPE]");
-//        }
-//        int count = adamMemberPriceAdminService.count(
-//                Wrappers.lambdaQuery(AdamMemberPrice.class)
-//                        .eq(AdamMemberPrice::getMemberPriceId, parameter.getMemberPriceId())
-//                        .eq(AdamMemberPrice::getMemberId, parameter.getMemberId())
-//                        .eq(AdamMemberPrice::getState, 1)
-//        );
-//        if (count <= 0) {
-//            return ResponseDto.failure("会员卡ID/价格ID无效");
-//        }
-//        return ResponseDto.success(adamMemberCodeAdminService.createGiftCode(parameter));
-//    }
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamMemberOrderAdminController.java

@@ -45,7 +45,7 @@ public class AdamMemberOrderAdminController extends BaseController {
         return prefix + "/orderList/order";
     }
 
-    @Log(title = "会员订单列表", businessType = BusinessType.LIST)
+    @Log(title = "会员管理:会员订单:列表", businessType = BusinessType.LIST)
     @RequiresPermissions("adam:order:orderlist:list")
     @PostMapping("/orderList/list")
     @ResponseBody
@@ -55,7 +55,7 @@ public class AdamMemberOrderAdminController extends BaseController {
         return getDataTable(list);
     }
 
-    @Log(title = "会员订单详情", businessType = BusinessType.DETAIL)
+    @Log(title = "会员管理:会员订单:详情", businessType = BusinessType.DETAIL)
     @RequiresPermissions("adam:order:orderlist:detail")
     @GetMapping("/orderList/detail/{orderId}")
     public String orderDetail(@PathVariable("orderId") String orderId, ModelMap mmap) {
@@ -64,7 +64,7 @@ public class AdamMemberOrderAdminController extends BaseController {
         return prefix + "/orderList/detail";
     }
 
-    @Log(title = "会员订单退款", businessType = BusinessType.MORDER_REFUND)
+    @Log(title = "会员管理:会员订单:退款", businessType = BusinessType.MORDER_REFUND)
     @RequiresPermissions("adam:order:orderlist:refund")
     @PostMapping("/orderList/refund")
     @ResponseBody

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamMemberPriceAdminController.java

-package com.liquidnet.client.admin.web.controller.zhengzai.adam;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.liquidnet.client.admin.common.annotation.Log;
-import com.liquidnet.client.admin.common.enums.BusinessType;
-import com.liquidnet.client.admin.zhengzai.adam.service.IAdamMemberPriceAdminService;
-import com.liquidnet.service.adam.dto.AdamMemberPriceParam;
-import com.liquidnet.service.adam.dto.vo.AdamMemberPriceVo;
-import com.liquidnet.service.adam.entity.AdamMemberPrice;
-import com.liquidnet.service.base.ResponseDto;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
-import java.util.ArrayList;
-import java.util.List;
-
-//@Api(tags = "会员价格")
-//@Slf4j
-//@Validated
-//@RestController
-//@RequestMapping("adam/mprice")
-public class AdamMemberPriceAdminController {
-//    @Autowired
-//    IAdamMemberPriceAdminService adamMemberPriceService;
-//
-//    @Log(title = "会员价格", businessType = BusinessType.LIST)
-//    @RequiresPermissions("adam:mprice:list")
-//    @ApiOperation(value = "会员价格列表")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "memberId", value = "会员卡ID[64]"),
-//    })
-//    @GetMapping("list")
-//    public ResponseDto<List<AdamMemberPriceVo>> list(@NotBlank(message = "会员类型ID不能为空") @RequestParam String memberId) {
-//        List<AdamMemberPrice> list = adamMemberPriceService.list(
-//                Wrappers.lambdaQuery(AdamMemberPrice.class).eq(AdamMemberPrice::getMemberId, memberId)
-//        );
-//        List<AdamMemberPriceVo> vos = new ArrayList<>();
-//        list.forEach(r -> {
-//            vos.add(AdamMemberPriceVo.getNew().copy(r));
-//        });
-//        return ResponseDto.success(vos);
-//    }
-//
-//    @Log(title = "会员价格", businessType = BusinessType.DETAIL)
-//    @RequiresPermissions("adam:mprice:info")
-//    @ApiOperation(value = "会员价格详情")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "memberId", value = "会员卡ID[64]"),
-//            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "memberPriceId", value = "会员卡价格ID[64]"),
-//    })
-//    @GetMapping("info")
-//    public ResponseDto<AdamMemberPriceVo> query(@NotBlank(message = "会员类型ID不能为空") @RequestParam String memberId,
-//                                                @NotBlank(message = "会员价格ID不能为空") @RequestParam String memberPriceId) {
-//        AdamMemberPrice one = adamMemberPriceService.getOne(
-//                Wrappers.lambdaQuery(AdamMemberPrice.class)
-//                        .eq(AdamMemberPrice::getMemberPriceId, memberPriceId)
-//                        .eq(AdamMemberPrice::getMemberId, memberId)
-//        );
-//        return ResponseDto.success(AdamMemberPriceVo.getNew().copy(one));
-//    }
-//
-//    @Log(title = "会员价格", businessType = BusinessType.INSERT)
-//    @RequiresPermissions("adam:mprice:add")
-//    @ApiOperation(value = "添加会员价格")
-//    @PostMapping("add")
-//    public ResponseDto<AdamMemberPriceVo> add(@Valid @RequestBody AdamMemberPriceParam param) {
-//        AdamMemberPrice entity = new AdamMemberPrice();
-//        BeanUtils.copyProperties(param, entity);
-//        return ResponseDto.success(adamMemberPriceService.add(entity));
-//    }
-//
-//    @Log(title = "会员价格", businessType = BusinessType.UPDATE)
-//    @RequiresPermissions("adam:mprice:edit")
-//    @ApiOperation(value = "编辑会员价格")
-//    @PostMapping("edit")
-//    public ResponseDto<AdamMemberPriceVo> edit(@Valid @RequestBody AdamMemberPriceParam param) {
-//        return adamMemberPriceService.edit(param) ? ResponseDto.success() : ResponseDto.failure("无效编辑");
-//    }
-}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/adam/AdamUserMemberAdminController.java

@@ -22,7 +22,7 @@ import javax.validation.constraints.NotBlank;
 import java.util.ArrayList;
 import java.util.List;
 
-@Api(tags = "登登登会员")
+@Api(tags = "会员黑名单")
 @Slf4j
 @Validated
 @RestController
@@ -31,18 +31,17 @@ public class AdamUserMemberAdminController {
     @Autowired
     RedisUtil redisUtil;
 
-    @Log(title = "会员用户", businessType = BusinessType.DETAIL)
+    @Log(title = "会员管理:会员黑名单:列表", businessType = BusinessType.LIST)
     @RequiresPermissions("adam:umember:blk:lis")
-    @ApiOperation(value = "会员黑名单UID")
+    @ApiOperation(value = "列表")
     @PostMapping("blk/lis")
     public ResponseDto<List<String>> listBlack() {
         return ResponseDto.success((List<String>) redisUtil.get(AdamRedisConst.BLK_LIST_MEMBER_UID));
     }
 
-
-    @Log(title = "会员用户", businessType = BusinessType.INSERT)
+    @Log(title = "会员管理:会员黑名单:添加", businessType = BusinessType.INSERT)
     @RequiresPermissions("adam:umember:blk:add")
-    @ApiOperation(value = "添加会员黑名单")
+    @ApiOperation(value = "拉黑")
     @PostMapping("blk/add")
     public ResponseDto<List<String>> addBlack(@NotBlank(message = "会员ID不能为空") @RequestParam String opts) {
         String[] uidArr = opts.split(",");
@@ -68,11 +67,11 @@ public class AdamUserMemberAdminController {
         return ResponseDto.success(invalidList);
     }
 
-    @Log(title = "会员用户", businessType = BusinessType.DELETE)
+    @Log(title = "会员管理:会员黑名单:添加", businessType = BusinessType.DELETE)
     @RequiresPermissions("adam:umember:blk:del")
-    @ApiOperation(value = "删除会员黑名单")
+    @ApiOperation(value = "移除")
     @PostMapping("blk/del")
-    public ResponseDto<Object> delBlack(@NotBlank(message = "会员ID不能为空") @RequestParam String opts) {
+    public ResponseDto<List<String>> delBlack(@NotBlank(message = "会员ID不能为空") @RequestParam String opts) {
         String[] uidArr = opts.split(",");
         List<String> blacklist = (List<String>) redisUtil.get(AdamRedisConst.BLK_LIST_MEMBER_UID);
         if (!CollectionUtils.isEmpty(blacklist)) {
@@ -81,6 +80,6 @@ public class AdamUserMemberAdminController {
             }
             redisUtil.set(AdamRedisConst.BLK_LIST_MEMBER_UID, blacklist);
         }
-        return ResponseDto.success();
+        return ResponseDto.success(blacklist);
     }
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/candy/CandyCouponCodeAdminController.java

@@ -3,21 +3,21 @@ package com.liquidnet.client.admin.web.controller.zhengzai.candy;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.liquidnet.client.admin.common.annotation.Log;
 import com.liquidnet.client.admin.common.core.controller.BaseController;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
+import com.liquidnet.client.admin.common.enums.BusinessType;
 import com.liquidnet.client.admin.common.utils.poi.ExcelUtil;
 import com.liquidnet.client.admin.zhengzai.candy.dto.CandyCouponCodeExcelDto;
 import com.liquidnet.client.admin.zhengzai.candy.service.ICandyCouponCodeAdminService;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
-import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.candy.constant.CandyRedisConst;
 import com.liquidnet.service.candy.dto.CandyCouponCodeDto;
 import com.liquidnet.service.candy.dto.admin.CandyCouponCodeListParam;
 import com.liquidnet.service.candy.dto.admin.CandyCouponCodeOptParam;
 import com.liquidnet.service.candy.entity.CandyCouponCode;
-import io.swagger.annotations.Api;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -28,7 +28,6 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
-@Api(tags = "券码管理")
 @Controller
 @RequestMapping("candy/coupon/code")
 public class CandyCouponCodeAdminController extends BaseController {
@@ -46,6 +45,7 @@ public class CandyCouponCodeAdminController extends BaseController {
     }
 
     @RequiresPermissions("candy:coupon:code:list")
+    @Log(title = "我的券:券码管理:列表", businessType = BusinessType.LIST)
     @PostMapping("list")
     @ResponseBody
     public TableDataInfo list(CandyCouponCodeListParam listParam) {
@@ -70,6 +70,7 @@ public class CandyCouponCodeAdminController extends BaseController {
     }
 
     @RequiresPermissions("candy:coupon:code:export")
+    @Log(title = "我的券:券码管理:导出", businessType = BusinessType.EXPORT)
     @PostMapping("export")
     @ResponseBody
     public AjaxResult export(CandyCouponCodeListParam listParam) {
@@ -84,6 +85,7 @@ public class CandyCouponCodeAdminController extends BaseController {
     }
 
     @RequiresPermissions("candy:coupon:code:invalid")
+    @Log(title = "我的券:券码管理:失效", businessType = BusinessType.UPDATE)
     @PostMapping("invalid")
     @ResponseBody
     public AjaxResult invalid(CandyCouponCodeOptParam optParam) {
@@ -108,6 +110,7 @@ public class CandyCouponCodeAdminController extends BaseController {
     }
 
     @RequiresPermissions("candy:coupon:code:recover")
+    @Log(title = "我的券:券码管理:退回", businessType = BusinessType.UPDATE)
     @PostMapping("recover")
     @ResponseBody
     public AjaxResult recover(CandyCouponCodeOptParam optParam) {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/candy/CandyMgtCouponAdminController.java

@@ -38,7 +38,7 @@ import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.List;
 
-@Api(tags = "券发放管理")
+@Api(tags = "我的券")
 @Controller
 @RequestMapping("candy/coupon/mgt")
 public class CandyMgtCouponAdminController extends BaseController {
@@ -63,6 +63,7 @@ public class CandyMgtCouponAdminController extends BaseController {
         return prefix + "/coupon" + couType;
     }
 
+    @Log(title = "我的券:券列表", businessType = BusinessType.LIST)
     @RequiresPermissions("candy:coupon:mgt:list")
     @PostMapping("list")
     @ResponseBody
@@ -92,6 +93,7 @@ public class CandyMgtCouponAdminController extends BaseController {
         return getDataTable(list);
     }
 
+    @Log(title = "我的券:券详情", businessType = BusinessType.DETAIL)
     @RequiresPermissions("candy:coupon:mgt:detail")
     @GetMapping("detail/{couType}/{mcouponId}")
     public String detail(@PathVariable("couType") int couType,
@@ -153,13 +155,21 @@ public class CandyMgtCouponAdminController extends BaseController {
         return prefix + "/add" + couType;
     }
 
-    @ApiOperation(value = "新建券")
+    @ApiOperation(value = "新建")
+    @Log(title = "我的券:券新建", businessType = BusinessType.INSERT)
     @RequiresPermissions("candy:coupon:mgt:add")
-    @Log(title = "券发放管理", businessType = BusinessType.INSERT)
     @PostMapping("add")
     @ResponseBody
     public AjaxResult addSave(@RequestBody @Validated CandyMgtCouponBuildParam buildParam) {
         logger.info("operator:{},buildParam:{}", ShiroUtils.getLoginName(), buildParam);
+        AjaxResult ajaxResult = this.buildValidProcessing(buildParam);
+        if (((int) ajaxResult.get(AjaxResult.CODE_TAG)) != 0) {
+            return ajaxResult;
+        }
+        return toAjax(candyMgtCouponAdminService.saveMgtCouponForCouponBuild(buildParam));
+    }
+
+    private AjaxResult buildValidProcessing(CandyMgtCouponBuildParam buildParam) {
         switch (buildParam.getCouType()) {
             case 1:// 代金券
                 BigDecimal valFace = buildParam.getValFace();
@@ -241,9 +251,27 @@ public class CandyMgtCouponAdminController extends BaseController {
                 }
             }
         }
-        return toAjax(candyMgtCouponAdminService.saveMgtCouponForCouponBuild(buildParam));
+        return AjaxResult.success();
+    }
+
+    @ApiOperation(value = "编辑")
+    @Log(title = "我的券:券编辑", businessType = BusinessType.UPDATE)
+    @RequiresPermissions("candy:coupon:mgt:edit")
+    @PostMapping("edit")
+    @ResponseBody
+    public AjaxResult editSave(@RequestBody @Validated CandyMgtCouponBuildParam buildParam) {
+        logger.info("operator:{},buildParam:{}", ShiroUtils.getLoginName(), buildParam);
+        if (StringUtils.isBlank(buildParam.getMcouponId())) {
+            return AjaxResult.warn("发放ID【mcouponId】不能为空");
+        }
+        AjaxResult ajaxResult = this.buildValidProcessing(buildParam);
+        if (((int) ajaxResult.get(AjaxResult.CODE_TAG)) != 0) {
+            return ajaxResult;
+        }
+        return toAjax(candyMgtCouponAdminService.editMgtCouponForCouponBuild(buildParam));
     }
 
+    @Log(title = "我的券:券取消", businessType = BusinessType.CANCEL)
     @RequiresPermissions("candy:coupon:mgt:cancel")
     @GetMapping("cancel/{mcouponId}")
     @ResponseBody

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/candy/service/ICandyMgtCouponAdminService.java

@@ -16,6 +16,8 @@ public interface ICandyMgtCouponAdminService extends IService<CandyMgtCoupon> {
 
     boolean saveMgtCouponForCouponBuild(CandyMgtCouponBuildParam parameter);
 
+    boolean editMgtCouponForCouponBuild(CandyMgtCouponBuildParam parameter);
+
     boolean saveMgtCouponInfo(CandyCoupon initCoupon, CandyMgtCoupon initMgtCoupon, List<CandyCouponRule> initCouponRuleList);
 
     boolean updateMgtCouponInfo(CandyCoupon updateCoupon, CandyMgtCoupon updateMgtCoupon, List<CandyCouponRule> initCouponRuleList);

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/candy/service/impl/CandyMgtCouponAdminServiceImpl.java

@@ -242,6 +242,12 @@ public class CandyMgtCouponAdminServiceImpl extends ServiceImpl<CandyMgtCouponMa
         return candyMgtCouponAdminService.saveMgtCouponInfo(initCoupon, initMgtCoupon, initCouponRuleList);
     }
 
+    @Override
+    public boolean editMgtCouponForCouponBuild(CandyMgtCouponBuildParam parameter) {
+        // TODO: 2021/9/17
+        return true;
+    }
+
     @Override
     @Transactional
     public boolean saveMgtCouponInfo(CandyCoupon initCoupon, CandyMgtCoupon initMgtCoupon, List<CandyCouponRule> initCouponRuleList) {