diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java index 5cd6903a6..585ac8b11 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPasswordController.java @@ -92,6 +92,28 @@ public class WxCouponPasswordController extends BaseController { final PageInfo page = wxCouponPasswordService.listVoAsPage(wxCouponPassword, pageNum, pageSize); return new ResultData(page); } + + @ApiOperation("启用/停用") + @PostMapping("/startOrStop") + @SystemControllerLog(description = "启用/停用") + public ResultData startOrStop(@RequestBody WxCouponPassword wxCouponPassword) { + // + if (wxCouponPassword.getCouponId() == null) { + logger.error("couponId不能为空: "); + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } + WxCouponPassword couponPassword = new WxCouponPassword(); + couponPassword.updateTenantInfo(getTenantInfo()); + couponPassword.setCouponId(wxCouponPassword.getCouponId()); + couponPassword.setExpireDate(wxCouponPassword.getExpireDate()); + try { + wxCouponPasswordService.postpone(couponPassword); + } catch (Exception e) { + logger.error(e.getMessage()); + return new ResultData(ErrorCode.COUPON_PASSWORD_POSTPONE_ERR); + } + return new ResultData(); + } } diff --git a/mallinkAdmin/src/main/resources/db/migration/V2023022800001__card.sql b/mallinkAdmin/src/main/resources/db/migration/V2023022800001__card.sql index 58100daf8..d691ad02e 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V2023022800001__card.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V2023022800001__card.sql @@ -3,7 +3,7 @@ alter table wx_card_info add column c_user_id bigint(20) comment '购买用户 alter table wx_card_info add column owner_user_id bigint(20) comment '持有用户编码'; alter table wx_card_info add column status int(1) not null default 0 comment '状态'; -###待做####### +###待做wx_card_info####### ##coupon_password_id,coupon_password,c_user_id,owner_user_id 刷数据,后两者不能为空 # 转赠验证wx_coupon_order的c_user_id不变 @@ -14,6 +14,9 @@ alter table wx_card_info add column status int(1) not null default 0 comment ' #set ci.c_user_id = co.c_user_id, ci.owner_user_id = co.owner_id +alter table wx_coupon_password add column is_stop int(1) not null default 0 comment '是否已停止1-是,0-否'; + + diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java index 12d30c1fc..8d859a168 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java @@ -17,7 +17,8 @@ public class WxCouponPassword extends TenantEntity { @Excel(name = "ID", width = 20, orderNum = "1") protected Long id; - + @TableField(exist = false) + private String idLike; @io.swagger.annotations.ApiModelProperty(value="卡券ID",name="couponId") private Long couponId; @io.swagger.annotations.ApiModelProperty(value="卡券短ID",name="couponShort") @@ -25,6 +26,8 @@ public class WxCouponPassword extends TenantEntity { @Excel(name = "兑换码", width = 20, orderNum = "2") @io.swagger.annotations.ApiModelProperty(value="商户名称",name="password") private String password; + @TableField(exist = false) + private String passwordLike; @Excel(name = "状态", width = 20, replace = {"初始_0", "发送中_1", "已发出_2", "已使用_3", "不可用_4"}, orderNum = "4") @io.swagger.annotations.ApiModelProperty(value="卡密状态: 0初始1信息发出中2信息已发出3已使用4已过期",name="status") private Integer status; @@ -44,6 +47,9 @@ public class WxCouponPassword extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "发放ID", name = "presentId") private Long presentId; + + @io.swagger.annotations.ApiModelProperty(value="是否已停止EnumYesOrNo",name="isStop") + private Integer isStop; @TableField(exist = false) private String statusStr; diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponPasswordService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponPasswordService.java index 1fc52b559..d851ce19d 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponPasswordService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponPasswordService.java @@ -75,4 +75,6 @@ public interface WxCouponPasswordService { List findList(WxCouponPassword wxCouponPassword); void postpone(WxCouponPassword wxCouponPassword); + + void startOrStop(WxCouponPassword wxCouponPassword); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java index 6a8221b39..53a851c00 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java @@ -298,18 +298,9 @@ public class WxCouponPasswordServiceImpl implements WxCouponPasswordService { wxCouponPasswordMapper.updatePostpone(wxCouponPassword); } - /* - public static void main(String[] args) { - WxCouponPasswordServiceImpl ll = new WxCouponPasswordServiceImpl(); - long startTime = System.currentTimeMillis(); - System.out.println(startTime); - ll.mkPasswords("456", 12345L, 100); - long endTime = System.currentTimeMillis(); - System.out.println(endTime); - long usedTime = (endTime-startTime)/1000; - System.out.println("耗时:" + usedTime + "s"); - } - */ - + @Override + public void startOrStop(WxCouponPassword wxCouponPassword) { + //如果当前卡密是已兑换的状态,则更新对应的电子卡状态即可 + } } diff --git a/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml index 0f115e92f..794474c83 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml @@ -15,11 +15,11 @@ - + - `id`,`tenant_id`,`parent_tenant_id`,`coupon_id`,`coupon_short`,`password`,`status`,`sended_phone`,`card_id`,`create_date`,`update_date`,`expire_date`,`present_id` + `id`,`tenant_id`,`parent_tenant_id`,`coupon_id`,`coupon_short`,`password`,`status`,`sended_phone`,`card_id`,`create_date`,`update_date`,`expire_date`,`present_id`,`is_stop` @@ -27,6 +27,9 @@ and `id` = #{id} + + and `id` like concat('%',#{idLike},'%') + and `tenant_id` = #{tenantId} @@ -39,9 +42,12 @@ and `coupon_short` = #{couponShort} - + and `password` = #{password} - + + + and `password` like concat('%',#{passwordLike},'%') + and `status` = #{status} @@ -65,6 +71,10 @@ and `present_id` = #{presentId} + + and `is_stop` = #{isStop} + + and id in