Просмотр исходного кода

[审批][修改][添加作废审批]

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
34e8f0b819
4 измененных файлов: 41 добавлений и 3 удалений
  1. +2
    -0
      mallinkAdmin/src/main/resources/db/migration/V201906271637__L_ALTER_FLOW.sql
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java
  3. +36
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java
  4. +2
    -2
      mallinkService/src/main/resources/mapper/WxCouponMapper.xml

+ 2
- 0
mallinkAdmin/src/main/resources/db/migration/V201906271637__L_ALTER_FLOW.sql Просмотреть файл

@@ -0,0 +1,2 @@
ALTER TABLE `wx_coupon`
ADD COLUMN `approval_type` SMALLINT(1) NULL DEFAULT 0 COMMENT '最后一次操作类型';

+ 1
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java Просмотреть файл

@@ -146,6 +146,7 @@ public class WxCoupon extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value="领取条件",name="condition") @io.swagger.annotations.ApiModelProperty(value="领取条件",name="condition")
private String conditions; private String conditions;


private Integer approvalType;


@Transient @Transient
private String merchantParams; private String merchantParams;


+ 36
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java Просмотреть файл

@@ -239,6 +239,7 @@ public class WxFlowServiceImpl implements WxFlowService {
wxCoupon.setStatus(EnumCouponStatus.COUPON_STATUS_TAKE_OFFF.getCode()); wxCoupon.setStatus(EnumCouponStatus.COUPON_STATUS_TAKE_OFFF.getCode());
} }
} }
wxCoupon.setApprovalType(operateType);
wxCouponMapper.updateByPrimaryKeySelective(wxCoupon); wxCouponMapper.updateByPrimaryKeySelective(wxCoupon);
} }
} }
@@ -338,7 +339,7 @@ public class WxFlowServiceImpl implements WxFlowService {
wxFlowRecord.setStartDate(startDate); wxFlowRecord.setStartDate(startDate);
wxFlowRecordService.saveOrUpdate(wxFlowRecord); wxFlowRecordService.saveOrUpdate(wxFlowRecord);


// 给审批人发送代办通知短信
//给审批人发送代办通知短信
List<MallUserInfo> mallUserInfoList = getUserByProcessInstanceId(processInstance.getId()); List<MallUserInfo> mallUserInfoList = getUserByProcessInstanceId(processInstance.getId());
for (MallUserInfo mallUserInfo:mallUserInfoList) { for (MallUserInfo mallUserInfo:mallUserInfoList) {
sendAssigneeMsgAndEmail(tenantId,mallUserInfo.getPhone(),mallUserInfo.getEmail(),starterInfo.getName(),businessId,flowType); sendAssigneeMsgAndEmail(tenantId,mallUserInfo.getPhone(),mallUserInfo.getEmail(),starterInfo.getName(),businessId,flowType);
@@ -360,6 +361,9 @@ public class WxFlowServiceImpl implements WxFlowService {
}else if(isBill(flowType)){ }else if(isBill(flowType)){
dynamicContentMap.put("bustype","账单"); dynamicContentMap.put("bustype","账单");
dynamicContentMap.put("contract", businessId.toString()); dynamicContentMap.put("contract", businessId.toString());
}else if(isCoupon(flowType)){
dynamicContentMap.put("bustype","有价卷");
dynamicContentMap.put("contract",businessId.toString());
} }
wxMsgRecord.setDynamicContentMap(dynamicContentMap); wxMsgRecord.setDynamicContentMap(dynamicContentMap);
mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode());
@@ -436,6 +440,9 @@ public class WxFlowServiceImpl implements WxFlowService {
}else if(isBill(flowType)){ }else if(isBill(flowType)){
msgReplaceMap.put("bustype","账单"); msgReplaceMap.put("bustype","账单");
msgReplaceMap.put("contract", businessId.toString()); msgReplaceMap.put("contract", businessId.toString());
}else if(isCoupon(flowType)){
msgReplaceMap.put("bustype","有价卷");
msgReplaceMap.put("contract",businessId.toString());
} }
mailMsg.setDynamicContentMap(msgReplaceMap); mailMsg.setDynamicContentMap(msgReplaceMap);
mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode());
@@ -462,6 +469,16 @@ public class WxFlowServiceImpl implements WxFlowService {
} }
return false; return false;
} }
public boolean isCoupon(Integer flowType){
if(EnumFlowKey.NEW_COUPON_UPLINE.getCode().equals(flowType)
||EnumFlowKey.NEW_CARD_UPLINE.getCode().equals(flowType)
||EnumFlowKey.NEW_GROUP_UPLINE.getCode().equals(flowType)
||EnumFlowKey.NEW_PRESS_UPLINE.getCode().equals(flowType)
){
return true;
}
return false;
}


public String variablesToJson(List<Map<String,Object>> variables){ public String variablesToJson(List<Map<String,Object>> variables){
HashMap<String,Object> map = new HashMap<>(); HashMap<String,Object> map = new HashMap<>();
@@ -837,6 +854,9 @@ public class WxFlowServiceImpl implements WxFlowService {
}else if(isBill(flowType)){ }else if(isBill(flowType)){
msgReplaceMap.put("bustype","账单"); msgReplaceMap.put("bustype","账单");
msgReplaceMap.put("contract", businessId.toString()); msgReplaceMap.put("contract", businessId.toString());
}else if(isCoupon(flowType)){
msgReplaceMap.put("bustype","有价卷");
msgReplaceMap.put("contract",businessId.toString());
} }
wxMsgRecord.setDynamicContentMap(msgReplaceMap); wxMsgRecord.setDynamicContentMap(msgReplaceMap);
mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode());
@@ -856,6 +876,9 @@ public class WxFlowServiceImpl implements WxFlowService {
}else if(isBill(flowType)){ }else if(isBill(flowType)){
msgReplaceMap.put("bustype","账单"); msgReplaceMap.put("bustype","账单");
msgReplaceMap.put("contract", businessId.toString()); msgReplaceMap.put("contract", businessId.toString());
}else if(isCoupon(flowType)){
msgReplaceMap.put("bustype","有价卷");
msgReplaceMap.put("contract",businessId.toString());
} }
mailMsg.setDynamicContentMap(msgReplaceMap); mailMsg.setDynamicContentMap(msgReplaceMap);
mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode());
@@ -885,6 +908,9 @@ public class WxFlowServiceImpl implements WxFlowService {
}else if(isBill(flowType)){ }else if(isBill(flowType)){
msgReplaceMap.put("bustype","账单"); msgReplaceMap.put("bustype","账单");
msgReplaceMap.put("contract", businessId.toString()); msgReplaceMap.put("contract", businessId.toString());
}else if(isCoupon(flowType)){
msgReplaceMap.put("bustype","有价卷");
msgReplaceMap.put("contract",businessId.toString());
} }
wxMsgRecord.setDynamicContentMap(msgReplaceMap); wxMsgRecord.setDynamicContentMap(msgReplaceMap);
mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode());
@@ -904,6 +930,9 @@ public class WxFlowServiceImpl implements WxFlowService {
}else if(isBill(flowType)){ }else if(isBill(flowType)){
msgReplaceMap.put("bustype","账单"); msgReplaceMap.put("bustype","账单");
msgReplaceMap.put("contract", businessId.toString()); msgReplaceMap.put("contract", businessId.toString());
}else if(isCoupon(flowType)){
msgReplaceMap.put("bustype","有价卷");
msgReplaceMap.put("contract",businessId.toString());
} }
mailMsg.setDynamicContentMap(msgReplaceMap); mailMsg.setDynamicContentMap(msgReplaceMap);
mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode());
@@ -1020,6 +1049,9 @@ public class WxFlowServiceImpl implements WxFlowService {
}else if(isBill(flowType)){ }else if(isBill(flowType)){
msgReplaceMap.put("bustype","账单"); msgReplaceMap.put("bustype","账单");
msgReplaceMap.put("contract", businessId.toString()); msgReplaceMap.put("contract", businessId.toString());
}else if(isCoupon(flowType)){
msgReplaceMap.put("bustype","有价卷");
msgReplaceMap.put("contract",businessId.toString());
} }
wxMsgRecord.setDynamicContentMap(msgReplaceMap); wxMsgRecord.setDynamicContentMap(msgReplaceMap);
mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode());
@@ -1046,6 +1078,9 @@ public class WxFlowServiceImpl implements WxFlowService {
}else if(isBill(flowType)){ }else if(isBill(flowType)){
msgReplaceMap.put("bustype","账单"); msgReplaceMap.put("bustype","账单");
msgReplaceMap.put("contract", businessId.toString()); msgReplaceMap.put("contract", businessId.toString());
}else if(isCoupon(flowType)){
msgReplaceMap.put("bustype","有价卷");
msgReplaceMap.put("contract",businessId.toString());
} }
mailMsg.setDynamicContentMap(msgReplaceMap); mailMsg.setDynamicContentMap(msgReplaceMap);
mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode());


+ 2
- 2
mallinkService/src/main/resources/mapper/WxCouponMapper.xml Просмотреть файл

@@ -42,7 +42,7 @@
<result column="stock_apply_status" property="stockApplyStatus"/> <result column="stock_apply_status" property="stockApplyStatus"/>
<result column="cancle_apply_status" property="cancleApplyStatus"/> <result column="cancle_apply_status" property="cancleApplyStatus"/>
<result column="conditions" jdbcType="VARCHAR" property="conditions"/> <result column="conditions" jdbcType="VARCHAR" property="conditions"/>
<result column="approval_type" property="approvalType"/>
</resultMap> </resultMap>
<resultMap id="statisMap" type="com.iformall.domain.vo.WxCouponStatisVo"> <resultMap id="statisMap" type="com.iformall.domain.vo.WxCouponStatisVo">
<id column="id" jdbcType="BIGINT" property="id"/> <id column="id" jdbcType="BIGINT" property="id"/>
@@ -95,7 +95,7 @@
`id`,`tenant_id`,`type`,`cover_img`,`cover_picture`,`detail_picture`,`title`,`sub_title`,`sale_price`,`use_price`,`use_limit_quantity`,`send_type`, `id`,`tenant_id`,`type`,`cover_img`,`cover_picture`,`detail_picture`,`title`,`sub_title`,`sale_price`,`use_price`,`use_limit_quantity`,`send_type`,
`valid_type`,`valid_start_date`,`valid_end_date`,`valid_days`,`detail`,`price`,`unit`,`remain_inventory`,`inventory`, `valid_type`,`valid_start_date`,`valid_end_date`,`valid_days`,`detail`,`price`,`unit`,`remain_inventory`,`inventory`,
`remark`,`status`,`create_date`,`update_date`,`business`,`sub_business`,`support_transfer`,`subsidy_num`,`subsidy_type`, `remark`,`status`,`create_date`,`update_date`,`business`,`sub_business`,`support_transfer`,`subsidy_num`,`subsidy_type`,
`press_limit_num`, `press_limit_hours`, `auto_refund`,`credit_price`,`credit_refund`,`put_apply_status`,`stock_apply_status`,`cancle_apply_status`,`conditions`
`press_limit_num`, `press_limit_hours`, `auto_refund`,`credit_price`,`credit_refund`,`put_apply_status`,`stock_apply_status`,`cancle_apply_status`,`conditions`,approval_type
</sql> </sql>


<sql id="dynamicWhereConditions"> <sql id="dynamicWhereConditions">


Загрузка…
Отмена
Сохранить