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

Merge branch 'release_toaliyun_real_2022_01' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_2022_01

release_toaliyun_real
winter 4 лет назад
Родитель
Сommit
615cd02c85
2 измененных файлов: 25 добавлений и 15 удалений
  1. +2
    -2
      mallinkService/src/main/java/com/iformall/enums/EnumFlowKey.java
  2. +23
    -13
      mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java

+ 2
- 2
mallinkService/src/main/java/com/iformall/enums/EnumFlowKey.java Просмотреть файл

@@ -18,10 +18,10 @@ public enum EnumFlowKey {

NEW_COUPON_UPLINE(9, "券审批"),
NEW_CARD_UPLINE(10, "卡审批"),
NEW_GROUP_UPLINE(11, "拼团"),
NEW_GROUP_UPLINE(11, "拼团审批"),
NEW_PRESS_UPLINE(12, "砍价审批"),
B_COUPON_MERCHANT_CREATE(22,"B端创建券审批"),
B_COUPON_MERCHANT_CREATE(22,"商户建券审批"),
NEW_COUPON_PREORDER_UPLINE(24,"商品预购审批"),
NEW_COUPON_DISTRIBUTION_UPLINE(25,"配送商品审批"),
NEW_COUPON_CREDIT_UPLINE(26,"积分券审批"),


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

@@ -123,19 +123,22 @@ public class WxFlowServiceImpl implements WxFlowService {
" ( '" + idWorker.nextId() + "', '" + id1 + "', '" + tenantId + "', '商品预购审批', '24', '0', '" + nowTimestr + "', '" + nowTimestr + "', '5')," +
" ( '" + idWorker.nextId() + "', '" + id1 + "', '" + tenantId + "', '配送商品审批', '25', '0', '" + nowTimestr + "', '" + nowTimestr + "', '5')," +
" ( '" + idWorker.nextId() + "', '" + id1 + "', '" + tenantId + "', '积分券审批', '26', '0', '" + nowTimestr + "', '" + nowTimestr + "', '5')," +
" ( '" + idWorker.nextId() + "', '" + id2 + "', '" + tenantId + "', '多经点位租金+物业合同签约', '19', '0', '" + nowTimestr + "', '" + nowTimestr + "', '11')," +
" ( '" + idWorker.nextId() + "', '" + id2 + "', '" + tenantId + "', '商铺租金+物业合同终止', '18', '0', '" + nowTimestr + "', '" + nowTimestr + "', '10')," +

" ( '" + idWorker.nextId() + "', '" + id2 + "', '" + tenantId + "', '商铺租金合同签约', '4', '0', '" + nowTimestr + "', '" + nowTimestr + "', '1')," +
" ( '" + idWorker.nextId() + "', '" + id2 + "', '" + tenantId + "', '多经点位租金合同签约', '5', '0', '" + nowTimestr + "', '" + nowTimestr + "', '2')," +
" ( '" + idWorker.nextId() + "', '" + id2 + "', '" + tenantId + "', '商铺租金合同终止', '6', '0', '" + nowTimestr + "', '" + nowTimestr + "', '3')," +
" ( '" + idWorker.nextId() + "', '" + id2 + "', '" + tenantId + "', '多经点位租金合同终止', '7', '0', '" + nowTimestr + "', '" + nowTimestr + "', '4')," +
" ( '" + idWorker.nextId() + "', '" + id2 + "', '" + tenantId + "', '商铺物业合同签约', '13', '0', '" + nowTimestr + "', '" + nowTimestr + "', '5')," +
" ( '" + idWorker.nextId() + "', '" + id2 + "', '" + tenantId + "', '商铺租金+物业合同签约', '17', '0', '" + nowTimestr + "', '" + nowTimestr + "', '9')," +
" ( '" + idWorker.nextId() + "', '" + id2 + "', '" + tenantId + "', '商铺物业合同终止', '14', '0', '" + nowTimestr + "', '" + nowTimestr + "', '6')," +
" ( '" + idWorker.nextId() + "', '" + id2 + "', '" + tenantId + "', '多经点位物业合同签约', '15', '0', '" + nowTimestr + "', '" + nowTimestr + "', '7')," +
" ( '" + idWorker.nextId() + "', '" + id2 + "', '" + tenantId + "', '多经点位物业合同终止', '16', '0', '" + nowTimestr + "', '" + nowTimestr + "', '8')," +
" ( '" + idWorker.nextId() + "', '" + id2 + "', '" + tenantId + "', '商铺租金+物业合同签约', '17', '0', '" + nowTimestr + "', '" + nowTimestr + "', '9')," +
" ( '" + idWorker.nextId() + "', '" + id2 + "', '" + tenantId + "', '商铺租金+物业合同终止', '18', '0', '" + nowTimestr + "', '" + nowTimestr + "', '10')," +
" ( '" + idWorker.nextId() + "', '" + id2 + "', '" + tenantId + "', '多经点位租金+物业合同签约', '19', '0', '" + nowTimestr + "', '" + nowTimestr + "', '11')," +
" ( '" + idWorker.nextId() + "', '" + id2 + "', '" + tenantId + "', '多经点位租金+物业合同终止', '20', '0', '" + nowTimestr + "', '" + nowTimestr + "', '12')," +
" ( '" + idWorker.nextId() + "', '" + id2 + "', '" + tenantId + "', '商铺物业合同终止', '14', '0', '" + nowTimestr + "', '" + nowTimestr + "', '6')," +
" ( '" + idWorker.nextId() + "', '" + id2 + "', '" + tenantId + "', '商铺租金合同终止', '6', '0', '" + nowTimestr + "', '" + nowTimestr + "', '3')," +
" ( '" + idWorker.nextId() + "', '" + id2 + "', '" + tenantId + "', '多经点位租金合同签约', '5', '0', '" + nowTimestr + "', '" + nowTimestr + "', '2')," +
" ( '" + idWorker.nextId() + "', '" + id2 + "', '" + tenantId + "', '多经点位租金合同终止', '7', '0', '" + nowTimestr + "', '" + nowTimestr + "', '4')," +
" ( '" + idWorker.nextId() + "', '" + id2 + "', '" + tenantId + "', '商铺租金合同签约', '4', '0', '" + nowTimestr + "', '" + nowTimestr + "', '1')," +
" ( '" + idWorker.nextId() + "', '" + id3 + "', '" + tenantId + "', '账单应收金额变更', '8', '0', '" + nowTimestr + "', '" + nowTimestr + "', '1');";

" ( '" + idWorker.nextId() + "', '" + id3 + "', '" + tenantId + "', '账单应收金额变更', '8', '0', '" + nowTimestr + "', '" + nowTimestr + "', '1')," +
" ( '" + idWorker.nextId() + "', '" + id3 + "', '" + tenantId + "', '结算单审批', '21', '0', '" + nowTimestr + "', '" + nowTimestr + "', '2');";
wxFlowConfigMapper.wxFlowConfigInit(initSql);
}

@@ -365,7 +368,10 @@ public class WxFlowServiceImpl implements WxFlowService {
|| EnumFlowKey.NEW_CARD_UPLINE.getCode().equals(flowType)
|| EnumFlowKey.NEW_GROUP_UPLINE.getCode().equals(flowType)
|| EnumFlowKey.NEW_PRESS_UPLINE.getCode().equals(flowType)
|| EnumFlowKey.B_COUPON_MERCHANT_CREATE.getCode().equals(flowType)) {
|| EnumFlowKey.B_COUPON_MERCHANT_CREATE.getCode().equals(flowType)
|| EnumFlowKey.NEW_COUPON_PREORDER_UPLINE.getCode().equals(flowType)
|| EnumFlowKey.NEW_COUPON_DISTRIBUTION_UPLINE.getCode().equals(flowType)
|| EnumFlowKey.NEW_COUPON_CREDIT_UPLINE.getCode().equals(flowType)) {
WxCoupon wxCoupon = new WxCoupon();
wxCoupon.setId(Long.parseLong(businessId));
wxCoupon.setUpdateDate(new Date());
@@ -737,9 +743,13 @@ public class WxFlowServiceImpl implements WxFlowService {
}
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)
|| EnumFlowKey.NEW_CARD_UPLINE.getCode().equals(flowType)
|| EnumFlowKey.NEW_GROUP_UPLINE.getCode().equals(flowType)
|| EnumFlowKey.NEW_PRESS_UPLINE.getCode().equals(flowType)
|| EnumFlowKey.B_COUPON_MERCHANT_CREATE.getCode().equals(flowType)
|| EnumFlowKey.NEW_COUPON_PREORDER_UPLINE.getCode().equals(flowType)
|| EnumFlowKey.NEW_COUPON_DISTRIBUTION_UPLINE.getCode().equals(flowType)
|| EnumFlowKey.NEW_COUPON_CREDIT_UPLINE.getCode().equals(flowType)
){
return true;
}


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