diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index d96d310da..3ffee76dc 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -7,15 +7,19 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxCoupon; +import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.vo.WxCouponStatisVo; +import com.iformall.enums.EnumCouponChannelStatus; import com.iformall.enums.EnumCouponType; import com.iformall.enums.EnumCouponValidType; +import com.iformall.mapper.WxCouponChannelMapper; import com.iformall.service.WxCouponService; import com.iformall.utils.DateUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.map.HashedMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,6 +35,8 @@ public class WxCouponController extends BaseController { @Autowired private WxCouponService wxCouponService; + @Autowired + private WxCouponChannelMapper wxCouponChannelMapper; @ApiOperation("分页列表接口") @GetMapping("list") @@ -61,6 +67,16 @@ public class WxCouponController extends BaseController { if (wxCoupon.getId() == null) { return new ResultData(ResultData.ERROR, "缺少id"); } + if(wxCoupon.getIsDel().equals(1)){ + WxCouponChannel query = new WxCouponChannel(); + query.setTenantId(wxCoupon.getTenantId()); + query.setCouponId(wxCoupon.getId()); + query.setStatus(EnumCouponChannelStatus.STATUS_THROW_IN.getCode()); + if(CollectionUtils.isNotEmpty(wxCouponChannelMapper.findList(query))){ + return new ResultData(ResultData.ERROR, "有活动正在上架,请先下架。"); + } + } + wxCoupon.setTenantId(getTenantId()); return wxCouponService.saveOrUpdate(wxCoupon); } diff --git a/mallinkAdmin/src/main/resources/db/migration/V201906051753__L_ALTER_COUPON.sql b/mallinkAdmin/src/main/resources/db/migration/V201906051753__L_ALTER_COUPON.sql new file mode 100644 index 000000000..288b7d59c --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201906051753__L_ALTER_COUPON.sql @@ -0,0 +1,2 @@ +alter table wx_coupon +add column `is_del` SMALLINT(1) DEFAULT 0 COMMENT '是否删除1是0否'; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index cab74561e..971213ab9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -194,6 +194,9 @@ public class WxCoupon extends BaseEntity { @Transient private Integer pressSuccCount; + @io.swagger.annotations.ApiModelProperty(value = "是否删除1是0否", name = "isDel") + private Integer isDel; + public String getSalePriceStr() { if(salePrice!=null) { salePriceStr = new BigDecimal(salePrice).divide(new BigDecimal(100)).toString(); diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/UserTaskVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/UserTaskVo.java new file mode 100644 index 000000000..19005f321 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/UserTaskVo.java @@ -0,0 +1,42 @@ +package com.iformall.domain.vo; + +import lombok.Data; +import java.io.Serializable; +import java.util.List; + +@Data +public class UserTaskVo implements Serializable{ + + private static final long serialVersionUID = 1L; + + private String name; + + private List userList; + + //1普通 2会签 3或签 + private Integer type; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public List getUserList() { + return userList; + } + + public void setUserList(List userList) { + this.userList = userList; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index fdd38381a..4bd15cce8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -20,6 +20,7 @@ import org.apache.commons.collections.map.HashedMap; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.flowable.bpmn.model.BpmnModel; +import org.flowable.bpmn.model.UserTask; import org.flowable.common.engine.api.FlowableIllegalArgumentException; import org.flowable.engine.*; import org.flowable.engine.runtime.Execution; @@ -117,7 +118,7 @@ public class WxFlowServiceImpl implements WxFlowService { contractType = Integer.parseInt(str); } - if(1 == flowType){ + if(EnumFlowKey.CONTRACT.getCode().equals(flowType)){ // 1租赁合同 2点位合同 3物业 4点位物业合同 if(contractType.intValue() == 1 || contractType.intValue() == 2){ WxRentContract rent = new WxRentContract(); @@ -142,7 +143,7 @@ public class WxFlowServiceImpl implements WxFlowService { wxPropertyContractService.updatePropertyContractStatus(businessId); } } - }else if(3 == flowType){ + }else if(EnumFlowKey.END_CONTRACT.getCode().equals(flowType)){ if(contractType.intValue() == 1 || contractType.intValue() == 2){ WxRentContract rent = new WxRentContract(); rent.setId(businessId); @@ -189,7 +190,7 @@ public class WxFlowServiceImpl implements WxFlowService { } wxPropertyContractMapper.updateApplyStatus(wxPropertyContract); } - } else if (2 == flowType) { + } else if (EnumFlowKey.BILL.getCode().equals(flowType)) { if(EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue()) { //账单审批 Integer billType = (Integer) getVariableByKey(variables, "billType"); diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index f131cf946..a4839de82 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -37,6 +37,7 @@ + @@ -263,7 +264,7 @@ - where 1 = 1 + where is_del = 0 and 0 = (select count(*) from wx_coupon_channel cc where c.`id` = cc.coupon_id