Преглед изворни кода

type

release_toaliyun_real
xhxu пре 5 година
родитељ
комит
56db9ec828
9 измењених фајлова са 1946 додато и 7 уклоњено
  1. +100
    -0
      mallinkAdmin/src/main/resources/db/migration/V202101060001__update_wx_credit_history.sql
  2. +1799
    -0
      mallinkAdmin/src/main/resources/db/migration/V202101060002__create_wx_c_user_from.sql
  3. +1
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java
  4. +1
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java
  5. +40
    -0
      mallinkService/src/main/java/com/iformall/enums/EnumCUserFrom.java
  6. +1
    -1
      mallinkService/src/main/java/com/iformall/enums/EnumUserType.java
  7. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java
  8. +1
    -1
      mallinkService/src/main/java/com/iformall/service/park/impl/util/ParkHelper.java
  9. +1
    -1
      mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml

+ 100
- 0
mallinkAdmin/src/main/resources/db/migration/V202101060001__update_wx_credit_history.sql Прегледај датотеку

@@ -0,0 +1,100 @@
update wx_credit_history_0 set operator_type = 2 where operator_type = 1;
update wx_credit_history_1 set operator_type = 2 where operator_type = 1;
update wx_credit_history_2 set operator_type = 2 where operator_type = 1;
update wx_credit_history_3 set operator_type = 2 where operator_type = 1;
update wx_credit_history_4 set operator_type = 2 where operator_type = 1;
update wx_credit_history_5 set operator_type = 2 where operator_type = 1;
update wx_credit_history_6 set operator_type = 2 where operator_type = 1;
update wx_credit_history_7 set operator_type = 2 where operator_type = 1;
update wx_credit_history_8 set operator_type = 2 where operator_type = 1;
update wx_credit_history_9 set operator_type = 2 where operator_type = 1;
update wx_credit_history_10 set operator_type = 2 where operator_type = 1;
update wx_credit_history_11 set operator_type = 2 where operator_type = 1;
update wx_credit_history_12 set operator_type = 2 where operator_type = 1;
update wx_credit_history_13 set operator_type = 2 where operator_type = 1;
update wx_credit_history_14 set operator_type = 2 where operator_type = 1;
update wx_credit_history_15 set operator_type = 2 where operator_type = 1;
update wx_credit_history_16 set operator_type = 2 where operator_type = 1;
update wx_credit_history_17 set operator_type = 2 where operator_type = 1;
update wx_credit_history_18 set operator_type = 2 where operator_type = 1;
update wx_credit_history_19 set operator_type = 2 where operator_type = 1;
update wx_credit_history_20 set operator_type = 2 where operator_type = 1;
update wx_credit_history_21 set operator_type = 2 where operator_type = 1;
update wx_credit_history_22 set operator_type = 2 where operator_type = 1;
update wx_credit_history_23 set operator_type = 2 where operator_type = 1;
update wx_credit_history_24 set operator_type = 2 where operator_type = 1;
update wx_credit_history_25 set operator_type = 2 where operator_type = 1;
update wx_credit_history_26 set operator_type = 2 where operator_type = 1;
update wx_credit_history_27 set operator_type = 2 where operator_type = 1;
update wx_credit_history_28 set operator_type = 2 where operator_type = 1;
update wx_credit_history_29 set operator_type = 2 where operator_type = 1;
update wx_credit_history_30 set operator_type = 2 where operator_type = 1;
update wx_credit_history_31 set operator_type = 2 where operator_type = 1;
update wx_credit_history_32 set operator_type = 2 where operator_type = 1;
update wx_credit_history_33 set operator_type = 2 where operator_type = 1;
update wx_credit_history_34 set operator_type = 2 where operator_type = 1;
update wx_credit_history_35 set operator_type = 2 where operator_type = 1;
update wx_credit_history_36 set operator_type = 2 where operator_type = 1;
update wx_credit_history_37 set operator_type = 2 where operator_type = 1;
update wx_credit_history_38 set operator_type = 2 where operator_type = 1;
update wx_credit_history_39 set operator_type = 2 where operator_type = 1;
update wx_credit_history_40 set operator_type = 2 where operator_type = 1;
update wx_credit_history_41 set operator_type = 2 where operator_type = 1;
update wx_credit_history_42 set operator_type = 2 where operator_type = 1;
update wx_credit_history_43 set operator_type = 2 where operator_type = 1;
update wx_credit_history_44 set operator_type = 2 where operator_type = 1;
update wx_credit_history_45 set operator_type = 2 where operator_type = 1;
update wx_credit_history_46 set operator_type = 2 where operator_type = 1;
update wx_credit_history_47 set operator_type = 2 where operator_type = 1;
update wx_credit_history_48 set operator_type = 2 where operator_type = 1;
update wx_credit_history_49 set operator_type = 2 where operator_type = 1;
update wx_credit_history_50 set operator_type = 2 where operator_type = 1;
update wx_credit_history_51 set operator_type = 2 where operator_type = 1;
update wx_credit_history_52 set operator_type = 2 where operator_type = 1;
update wx_credit_history_53 set operator_type = 2 where operator_type = 1;
update wx_credit_history_54 set operator_type = 2 where operator_type = 1;
update wx_credit_history_55 set operator_type = 2 where operator_type = 1;
update wx_credit_history_56 set operator_type = 2 where operator_type = 1;
update wx_credit_history_57 set operator_type = 2 where operator_type = 1;
update wx_credit_history_58 set operator_type = 2 where operator_type = 1;
update wx_credit_history_59 set operator_type = 2 where operator_type = 1;
update wx_credit_history_60 set operator_type = 2 where operator_type = 1;
update wx_credit_history_61 set operator_type = 2 where operator_type = 1;
update wx_credit_history_62 set operator_type = 2 where operator_type = 1;
update wx_credit_history_63 set operator_type = 2 where operator_type = 1;
update wx_credit_history_64 set operator_type = 2 where operator_type = 1;
update wx_credit_history_65 set operator_type = 2 where operator_type = 1;
update wx_credit_history_66 set operator_type = 2 where operator_type = 1;
update wx_credit_history_67 set operator_type = 2 where operator_type = 1;
update wx_credit_history_68 set operator_type = 2 where operator_type = 1;
update wx_credit_history_69 set operator_type = 2 where operator_type = 1;
update wx_credit_history_70 set operator_type = 2 where operator_type = 1;
update wx_credit_history_71 set operator_type = 2 where operator_type = 1;
update wx_credit_history_72 set operator_type = 2 where operator_type = 1;
update wx_credit_history_73 set operator_type = 2 where operator_type = 1;
update wx_credit_history_74 set operator_type = 2 where operator_type = 1;
update wx_credit_history_75 set operator_type = 2 where operator_type = 1;
update wx_credit_history_76 set operator_type = 2 where operator_type = 1;
update wx_credit_history_77 set operator_type = 2 where operator_type = 1;
update wx_credit_history_78 set operator_type = 2 where operator_type = 1;
update wx_credit_history_79 set operator_type = 2 where operator_type = 1;
update wx_credit_history_80 set operator_type = 2 where operator_type = 1;
update wx_credit_history_81 set operator_type = 2 where operator_type = 1;
update wx_credit_history_82 set operator_type = 2 where operator_type = 1;
update wx_credit_history_83 set operator_type = 2 where operator_type = 1;
update wx_credit_history_84 set operator_type = 2 where operator_type = 1;
update wx_credit_history_85 set operator_type = 2 where operator_type = 1;
update wx_credit_history_86 set operator_type = 2 where operator_type = 1;
update wx_credit_history_87 set operator_type = 2 where operator_type = 1;
update wx_credit_history_88 set operator_type = 2 where operator_type = 1;
update wx_credit_history_89 set operator_type = 2 where operator_type = 1;
update wx_credit_history_90 set operator_type = 2 where operator_type = 1;
update wx_credit_history_91 set operator_type = 2 where operator_type = 1;
update wx_credit_history_92 set operator_type = 2 where operator_type = 1;
update wx_credit_history_93 set operator_type = 2 where operator_type = 1;
update wx_credit_history_94 set operator_type = 2 where operator_type = 1;
update wx_credit_history_95 set operator_type = 2 where operator_type = 1;
update wx_credit_history_96 set operator_type = 2 where operator_type = 1;
update wx_credit_history_97 set operator_type = 2 where operator_type = 1;
update wx_credit_history_98 set operator_type = 2 where operator_type = 1;
update wx_credit_history_99 set operator_type = 2 where operator_type = 1;

+ 1799
- 0
mallinkAdmin/src/main/resources/db/migration/V202101060002__create_wx_c_user_from.sql
Разлика између датотеке није приказан због своје велике величине
Прегледај датотеку


+ 1
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java Прегледај датотеку

@@ -71,7 +71,7 @@ public class WxCreditHistoryController extends BaseController{
wxCreditHistory.setTenantId(wxCUser.getFinalTenantId()); wxCreditHistory.setTenantId(wxCUser.getFinalTenantId());
wxCreditHistory.setCUserId(wxCUser.getUserId()); wxCreditHistory.setCUserId(wxCUser.getUserId());
wxCreditHistory.setOperatorId(wxCUser.getUserId()); wxCreditHistory.setOperatorId(wxCUser.getUserId());
wxCreditHistory.setOperatorType(EnumUserType.CUSER.getCode());
wxCreditHistory.setOperatorType(EnumUserType.CUSERBASIC.getCode());


if(wxCreditHistory.getCreditType().equals(EnumScoreType.GAME_ADD_CREDIT.getCode())){ if(wxCreditHistory.getCreditType().equals(EnumScoreType.GAME_ADD_CREDIT.getCode())){
wxCreditHistory.setChangePurpose(EnumScoreType.GAME_ADD_CREDIT.getMessage()); wxCreditHistory.setChangePurpose(EnumScoreType.GAME_ADD_CREDIT.getMessage());


+ 1
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java Прегледај датотеку

@@ -959,7 +959,7 @@ public class WxUserGrantController extends BaseController {
wxCreditHistory.setCreateDate(new Date()); wxCreditHistory.setCreateDate(new Date());
wxCreditHistory.setCreditType(EnumScoreType.COMPLETE_INFO.getCode()); wxCreditHistory.setCreditType(EnumScoreType.COMPLETE_INFO.getCode());
wxCreditHistory.setChangePurpose(EnumScoreType.COMPLETE_INFO.getMessage()); wxCreditHistory.setChangePurpose(EnumScoreType.COMPLETE_INFO.getMessage());
wxCreditHistory.setOperatorType(EnumUserType.CUSER.getCode());
wxCreditHistory.setOperatorType(EnumUserType.CUSERBASIC.getCode());
wxCreditHistory.setOperatorId(memberId); wxCreditHistory.setOperatorId(memberId);
wxCreditHistoryService.saveOrUpdate(wxCreditHistory); wxCreditHistoryService.saveOrUpdate(wxCreditHistory);
wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_IMPORT, record,tenantEntity); wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_IMPORT, record,tenantEntity);


+ 40
- 0
mallinkService/src/main/java/com/iformall/enums/EnumCUserFrom.java Прегледај датотеку

@@ -0,0 +1,40 @@
package com.iformall.enums;


/**
* @author Stormeye
*/

public enum EnumCUserFrom {

FROM_C_USER(1,"来源于微信用户"),
FROM_C_USER_BASIC_INFO(2,"来源于会员"),
FROM_MERCHANT(3,"来源于微信用户"),
FROM_COUPON_CHANNEL(4,"来源于卷"),
;

public static EnumCUserFrom getEnum(Integer code) {
for (EnumCUserFrom value : values()) {
if (value.getCode().equals(code)) {
return value;
}
}
return null;
}

private Integer code;
private String message;

EnumCUserFrom(Integer code, String message) {
this.code = code;
this.message = message;
}

public Integer getCode() {
return code;
}

public String getMessage() {
return message;
}
}

+ 1
- 1
mallinkService/src/main/java/com/iformall/enums/EnumUserType.java Прегледај датотеку

@@ -3,7 +3,7 @@ package com.iformall.enums;
public enum EnumUserType { public enum EnumUserType {


CUSER(1, "C端用户"), CUSER(1, "C端用户"),
CUSERBASIC(2, "C端用户(偏向A端)"),
CUSERBASIC(2, "C端用户(会员)"),
BUSER(3, "B端用户"), BUSER(3, "B端用户"),
MALLUSER(4, "A端用户") MALLUSER(4, "A端用户")
; ;


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java Прегледај датотеку

@@ -467,7 +467,7 @@ public class WxGameServiceImpl implements WxGameService {
wxCreditHistory.setTenantId(wxGame.getFinalTenantId()); wxCreditHistory.setTenantId(wxGame.getFinalTenantId());
wxCreditHistory.setCUserId(userId); wxCreditHistory.setCUserId(userId);
wxCreditHistory.setOperatorId(userId); wxCreditHistory.setOperatorId(userId);
wxCreditHistory.setOperatorType(EnumUserType.CUSER.getCode());
wxCreditHistory.setOperatorType(EnumUserType.CUSERBASIC.getCode());
wxCreditHistory.setCreditNum(credit); wxCreditHistory.setCreditNum(credit);
wxCreditHistory.setCreditType(EnumScoreType.GAME_ADD_CREDIT.getCode()); wxCreditHistory.setCreditType(EnumScoreType.GAME_ADD_CREDIT.getCode());
wxCreditHistory.setChangePurpose(EnumScoreType.GAME_ADD_CREDIT.getMessage()); wxCreditHistory.setChangePurpose(EnumScoreType.GAME_ADD_CREDIT.getMessage());
@@ -512,7 +512,7 @@ public class WxGameServiceImpl implements WxGameService {
wxCreditHistory.setTenantId(wxGame.getFinalTenantId()); wxCreditHistory.setTenantId(wxGame.getFinalTenantId());
wxCreditHistory.setCUserId(userId); wxCreditHistory.setCUserId(userId);
wxCreditHistory.setOperatorId(userId); wxCreditHistory.setOperatorId(userId);
wxCreditHistory.setOperatorType(EnumUserType.CUSER.getCode());
wxCreditHistory.setOperatorType(EnumUserType.CUSERBASIC.getCode());
wxCreditHistory.setCreditNum(wxGame.getPlayCredit()); wxCreditHistory.setCreditNum(wxGame.getPlayCredit());
wxCreditHistory.setCreditType(EnumScoreType.GAME_LES_CREDIT.getCode()); wxCreditHistory.setCreditType(EnumScoreType.GAME_LES_CREDIT.getCode());
wxCreditHistory.setChangePurpose(EnumScoreType.GAME_LES_CREDIT.getMessage()); wxCreditHistory.setChangePurpose(EnumScoreType.GAME_LES_CREDIT.getMessage());


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/park/impl/util/ParkHelper.java Прегледај датотеку

@@ -86,7 +86,7 @@ public class ParkHelper {
// wxCreditHistory.setCreateDate(new Date()); // wxCreditHistory.setCreateDate(new Date());
wxCreditHistory.setCreditType(EnumScoreType.BIND_CAR.getCode()); wxCreditHistory.setCreditType(EnumScoreType.BIND_CAR.getCode());
wxCreditHistory.setChangePurpose(EnumScoreType.BIND_CAR.getMessage()); wxCreditHistory.setChangePurpose(EnumScoreType.BIND_CAR.getMessage());
wxCreditHistory.setOperatorType(EnumUserType.CUSER.getCode());
wxCreditHistory.setOperatorType(EnumUserType.CUSERBASIC.getCode());
wxCreditHistory.setOperatorId(cuUserId); wxCreditHistory.setOperatorId(cuUserId);
wxCreditHistoryService.saveOrUpdate(wxCreditHistory); wxCreditHistoryService.saveOrUpdate(wxCreditHistory);
} }


+ 1
- 1
mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml Прегледај датотеку

@@ -160,7 +160,7 @@
credit.ticket_number ticketNumber, credit.ticket_number ticketNumber,
case when credit.operator_type=4 then (select name from mall_user_info where id=credit.operator_id) case when credit.operator_type=4 then (select name from mall_user_info where id=credit.operator_id)
when credit.operator_type=3 then (select name from wx_merchant_b_user where id=credit.operator_id) when credit.operator_type=3 then (select name from wx_merchant_b_user where id=credit.operator_id)
when credit.operator_type=1 then (select nick_name from wx_c_user_basic_info where id=credit.operator_id)
when credit.operator_type=2 then (select nick_name from wx_c_user_basic_info where id=credit.operator_id)
else '' end operator, else '' end operator,
credit.change_purpose changePurpose credit.change_purpose changePurpose
FROM FROM


Loading…
Откажи
Сачувај