diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java index 04ca65484..a50bd2bc9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java @@ -71,9 +71,8 @@ public class WxCreditHistoryController extends BaseController { if(Objects.isNull(merchantId)|| StringUtils.isEmpty(spendStr)||Objects.isNull(userId)) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL) ; } - try { - Map result = wxCreditHistoryService.findByMerchantIdAndSpend(merchantId, spendStr, userId) ; + Map result = wxCreditHistoryService.findByMerchantIdAndSpend(getTenantInfo(),merchantId, userId,spendStr); return new ResultData(result); } catch (MallinkException e) { return new ResultData(e.getErrorCode(),e.getMessage()); @@ -97,6 +96,7 @@ public class WxCreditHistoryController extends BaseController { String desc = ""; if(wxCreditHistory.getCreditType().equals(EnumScoreType.SPEND_CREDIT.getCode())){ WxMerchant byId = wxMerchantService.getById(wxCreditHistory.getMerchantId()); + wxCreditHistory.setBusinessId(byId.getBusinessId()); desc = "管理端手动积分:消费商户["+byId.getName()+"] 消费金额["+wxCreditHistory.getSpendStr()+"元]"; }else if(wxCreditHistory.getCreditType().equals(EnumScoreType.REDUCE_CREDIT.getCode())){ desc = "管理端手动扣减积分"; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreHistoryController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreHistoryController.java index 685dd1be9..2332afdf5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreHistoryController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreHistoryController.java @@ -58,6 +58,7 @@ public class WxScoreHistoryController extends BaseController { } wxScoreHistory.setTenantId(getTenantInfo().getFinalTenantId()); wxScoreHistory.setFinalTenantId(getTenantInfo().getFinalTenantId()); + wxScoreHistory.setRulesTenantId(getTenantInfo().getTenantId()); wxScoreHistoryService.saveOrUpdate(wxScoreHistory); return new ResultData(); } @@ -72,6 +73,7 @@ public class WxScoreHistoryController extends BaseController { } wxScoreHistory.setTenantId(getTenantInfo().getFinalTenantId()); wxScoreHistory.setFinalTenantId(getTenantInfo().getFinalTenantId()); + wxScoreHistory.setRulesTenantId(getTenantInfo().getTenantId()); wxScoreHistoryService.saveOrUpdate(wxScoreHistory); return new ResultData(); } diff --git a/mallinkAdmin/src/main/resources/db/migration/V2023033000002_add_rules_tenant_id.sql b/mallinkAdmin/src/main/resources/db/migration/V2023033000002_add_rules_tenant_id.sql new file mode 100644 index 000000000..be6ece528 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V2023033000002_add_rules_tenant_id.sql @@ -0,0 +1,606 @@ +ALTER TABLE `mallink`.`wx_credit_history_0` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_1` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_2` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_3` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_4` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_5` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_6` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_7` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_8` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_9` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_10` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_11` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_12` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_13` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_14` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_15` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_16` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_17` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_18` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_19` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_20` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_21` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_22` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_23` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_24` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_25` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_26` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_27` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_28` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_29` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_30` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_31` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_32` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_33` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_34` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_35` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_36` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_37` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_38` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_39` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_40` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_41` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_42` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_43` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_44` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_45` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_46` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_47` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_48` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_49` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_50` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_51` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_52` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_53` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_54` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_55` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_56` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_57` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_58` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_59` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_60` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_61` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_62` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_63` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_64` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_65` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_66` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_67` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_68` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_69` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_70` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_71` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_72` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_73` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_74` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_75` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_76` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_77` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_78` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_79` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_80` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_81` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_82` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_83` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_84` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_85` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_86` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_87` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_88` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_89` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_90` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_91` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_92` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_93` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_94` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_95` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_96` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_97` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_98` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_credit_history_99` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; + +update `mallink`.`wx_credit_history_0` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_1` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_2` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_3` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_4` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_5` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_6` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_7` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_8` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_9` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_10` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_11` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_12` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_13` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_14` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_15` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_16` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_17` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_18` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_19` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_20` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_21` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_22` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_23` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_24` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_25` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_26` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_27` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_28` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_29` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_30` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_31` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_32` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_33` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_34` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_35` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_36` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_37` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_38` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_39` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_40` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_41` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_42` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_43` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_44` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_45` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_46` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_47` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_48` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_49` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_50` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_51` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_52` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_53` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_54` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_55` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_56` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_57` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_58` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_59` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_60` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_61` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_62` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_63` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_64` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_65` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_66` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_67` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_68` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_69` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_70` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_71` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_72` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_73` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_74` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_75` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_76` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_77` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_78` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_79` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_80` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_81` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_82` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_83` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_84` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_85` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_86` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_87` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_88` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_89` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_90` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_91` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_92` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_93` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_94` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_95` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_96` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_97` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_98` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_credit_history_99` set `rules_tenant_id` = `tenant_id`; + + + + +ALTER TABLE `mallink`.`wx_score_history_0` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_1` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_2` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_3` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_4` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_5` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_6` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_7` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_8` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_9` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_10` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_11` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_12` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_13` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_14` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_15` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_16` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_17` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_18` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_19` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_20` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_21` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_22` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_23` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_24` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_25` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_26` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_27` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_28` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_29` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_30` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_31` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_32` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_33` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_34` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_35` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_36` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_37` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_38` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_39` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_40` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_41` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_42` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_43` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_44` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_45` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_46` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_47` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_48` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_49` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_50` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_51` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_52` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_53` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_54` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_55` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_56` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_57` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_58` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_59` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_60` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_61` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_62` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_63` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_64` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_65` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_66` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_67` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_68` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_69` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_70` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_71` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_72` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_73` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_74` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_75` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_76` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_77` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_78` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_79` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_80` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_81` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_82` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_83` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_84` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_85` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_86` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_87` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_88` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_89` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_90` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_91` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_92` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_93` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_94` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_95` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_96` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_97` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_98` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; +ALTER TABLE `mallink`.`wx_score_history_99` +ADD COLUMN `rules_tenant_id` varchar(5) AFTER `parent_tenant_id`; + +update `mallink`.`wx_score_history_0` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_1` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_2` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_3` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_4` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_5` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_6` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_7` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_8` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_9` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_10` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_11` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_12` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_13` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_14` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_15` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_16` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_17` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_18` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_19` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_20` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_21` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_22` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_23` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_24` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_25` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_26` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_27` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_28` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_29` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_30` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_31` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_32` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_33` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_34` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_35` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_36` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_37` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_38` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_39` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_40` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_41` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_42` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_43` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_44` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_45` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_46` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_47` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_48` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_49` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_50` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_51` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_52` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_53` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_54` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_55` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_56` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_57` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_58` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_59` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_60` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_61` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_62` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_63` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_64` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_65` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_66` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_67` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_68` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_69` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_70` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_71` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_72` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_73` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_74` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_75` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_76` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_77` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_78` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_79` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_80` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_81` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_82` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_83` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_84` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_85` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_86` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_87` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_88` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_89` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_90` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_91` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_92` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_93` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_94` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_95` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_96` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_97` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_98` set `rules_tenant_id` = `tenant_id`; +update `mallink`.`wx_score_history_99` set `rules_tenant_id` = `tenant_id`; \ No newline at end of file diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java index a416cea5e..a41765c65 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java @@ -66,7 +66,7 @@ public class WxCreditHistoryController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL) ; } try { - Map result = wxCreditHistoryService.findByMerchantIdAndSpend(merchantId, spendStr, userId); + Map result = wxCreditHistoryService.findByMerchantIdAndSpend(getTenantInfo(),merchantId, userId, spendStr); return new ResultData(result); } catch (MallinkException e) { return new ResultData(e.getErrorCode(), e.getMessage()); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java index acc17b6fa..27892435d 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java @@ -18,6 +18,9 @@ public class WxCreditHistory extends BaseTenantEntity { protected Long id; + @io.swagger.annotations.ApiModelProperty(value="规则租户ID",name="rulesTenantId") + protected String rulesTenantId; + @TableField(exist = false) private List userIdList; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxScoreHistory.java b/mallinkService/src/main/java/com/iformall/domain/po/WxScoreHistory.java index 1115cbc23..62fac20ae 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxScoreHistory.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxScoreHistory.java @@ -16,6 +16,9 @@ public class WxScoreHistory extends BaseTenantEntity { protected Long id; + @io.swagger.annotations.ApiModelProperty(value="规则租户ID",name="rulesTenantId") + protected String rulesTenantId; + @io.swagger.annotations.ApiModelProperty(value="会员ID",name="cUserId") private Long cUserId; @io.swagger.annotations.ApiModelProperty(value="创建日期",name="createDate") diff --git a/mallinkService/src/main/java/com/iformall/service/WxCreditHistoryService.java b/mallinkService/src/main/java/com/iformall/service/WxCreditHistoryService.java index ff68923e5..268e02185 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCreditHistoryService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCreditHistoryService.java @@ -66,11 +66,11 @@ public interface WxCreditHistoryService { /** * 根据Id删除实体 * - * @param id + * @param */ //void deleteById(Long id); - Map findByMerchantIdAndSpend(Long merchantId, String spendStr, Long userId); + Map findByMerchantIdAndSpend(TenantEntity tenantEntity,Long merchantId,Long userId,String spendStr); void clearCreditByYear(); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java index 4bb4864bb..7022a55dd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -598,36 +598,20 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { } record.setCreditAmount(currentCreditAmount); - int creditChangeNumOrigin = creditIncrement(record,tenantEntity); - int creditChangeNum = creditChangeNumOrigin ; - //是否参与了生日积分倍率 boolean hasBirthDateCredit = false; - if (record.getCreditType().equals(EnumScoreType.CONSUMPTION.getCode()) - || record.getCreditType().equals(EnumScoreType.SPEND_CREDIT.getCode())) { - //等级积分配置 - try { - creditChangeNum = CreditUtil.calUserCredit(creditChangeNumOrigin, wxCUserBasicInfo, tenantEntity, wxScoreRulesService,wxLevelConfigMapper); - if (Objects.nonNull(CreditUtil.getIsBirthDayScale())) { - hasBirthDateCredit = true; - } - } catch (Exception e) { - logger.error("积分倍率计算异常",e); - } finally { - CreditUtil.clear(); - } - } + int creditChangeNumOrigin = creditIncrement(record,tenantEntity,wxCUserBasicInfo,hasBirthDateCredit); - if (creditChangeNum != 0) { - Integer total = currentCreditAmount + creditChangeNum; + if (creditChangeNumOrigin != 0) { + Integer total = currentCreditAmount + creditChangeNumOrigin; // if (total > Integer.MAX_VALUE) { // throw new MallinkException(ErrorCode.OUT_OF_CREDIT); // } - if (total < 0 && creditChangeNum < 0 && !Objects.equals(record.getCreditType(),EnumScoreType.REFUND_CONSUMPTION.getCode())) { + if (total < 0 && creditChangeNumOrigin < 0 && !Objects.equals(record.getCreditType(),EnumScoreType.REFUND_CONSUMPTION.getCode())) { throw new MallinkException(ErrorCode.CREDIT_NOT_ENOUGH); } //如果为导入的会员 则直接覆盖总积分和操作积分明细 if (!Objects.equals(record.getCreditType(),EnumScoreType.MEM_IMPORT.getCode())) { - record.setCreditNum(creditChangeNum); + record.setCreditNum(creditChangeNumOrigin); record.setCreditAmount(total); } if (record.getId() == null) { @@ -736,41 +720,42 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { // } @Override - public Map findByMerchantIdAndSpend(Long merchantId, String spendStr, Long userId) { + public Map findByMerchantIdAndSpend(TenantEntity tenantEntity,Long merchantId,Long userId,String spendStr) { + WxMerchant wxMerchant = wxMerchantMapper.selectById(merchantId); - Map creditMap = Maps.newHashMap(); - if (wxMerchant != null && wxMerchant.getBusinessId() != null) { - WxCreditHistory wxCreditHistory = new WxCreditHistory(); - wxCreditHistory.setBusinessId(wxMerchant.getBusinessId()); - //wxCreditHistory.updateTenantInfo(tenantEntity); - wxCreditHistory.setTenantId(wxMerchant.getFinalTenantId()); - wxCreditHistory.setFinalTenantId(wxMerchant.getFinalTenantId()); - int credit; - int creditNew = 0 ; - if (StringUtils.isNotBlank(spendStr)) { - wxCreditHistory.setSpend(new BigDecimal(spendStr).multiply(new BigDecimal(100)).intValue()); - credit = payAddCredit(wxCreditHistory,wxMerchant); - if (Objects.nonNull(userId)) { - WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(userId,wxMerchant.getFinalTenantId()); - try { - creditNew = CreditUtil.calUserCredit(credit, wxCUserBasicInfo, wxMerchant, wxScoreRulesService,wxLevelConfigMapper); - } catch (Exception e) { - logger.error("积分倍率计算异常",e); - } finally { - CreditUtil.clear(); - } - } else { - creditNew = credit; - } - } - creditMap.put("credit", creditNew); + if(wxMerchant == null){ + throw new MallinkException(ErrorCode.SHOP_IS_NOT_FOUND); + } + + WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(userId,tenantEntity.getFinalTenantId()); + if (wxCUserBasicInfo == null) { + //验证此用户是否存在 + throw new MallinkException(ErrorCode.USER_NOT_AUTH_PHONE); + } + if (wxCUserBasicInfo != null && EnumCreditLockedStatus.CLOSE.getCode().equals(wxCUserBasicInfo.getStatus())) { + logger.info(ErrorCode.MEMBER_IS_LOCKED.getMessage()); + throw new MallinkException(ErrorCode.MEMBER_IS_LOCKED); } + Map creditMap = Maps.newHashMap(); + + WxCreditHistory wxCreditHistory = new WxCreditHistory(); + wxCreditHistory.setTenantId(tenantEntity.getFinalTenantId()); + wxCreditHistory.setBusinessId(wxMerchant.getBusinessId()); + wxCreditHistory.setCreditType(EnumScoreType.SPEND_CREDIT.getCode()); + wxCreditHistory.setSpend(new BigDecimal(spendStr).multiply(new BigDecimal(100)).intValue()); + + boolean hasBirthDateCredit = false; + int creditNew = payAddCredit(wxCreditHistory, tenantEntity, wxCUserBasicInfo, hasBirthDateCredit); + + creditMap.put("rulesTenantId",wxCreditHistory.getRulesTenantId()); + creditMap.put("hasBirthDateCredit", hasBirthDateCredit); + creditMap.put("credit", creditNew); return creditMap; } //根据积分类型计算"增加积分" - private int creditIncrement(WxCreditHistory record,TenantEntity tenantEntity) { + private int creditIncrement(WxCreditHistory record,TenantEntity tenantEntity,WxCUserBasicInfo wxCUserBasicInfo,boolean hasBirthDateCredit) { //查找C端用户的成长值 if (record.getCreditType() == EnumScoreType.LOGIN.getCode()) { // return loginAddCredit(record,tenantEntity);//登陆加积分取消 @@ -789,27 +774,29 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { return infoAddCredit(record,tenantEntity); } if (record.getCreditType() == EnumScoreType.SPEND_CREDIT.getCode()) { - return spendCredit(record); + return payAddCredit(record,tenantEntity,wxCUserBasicInfo,hasBirthDateCredit); } if (record.getCreditType() == EnumScoreType.CHANGE_CREDIT.getCode()) { - return changeCredit(record); + return changeCredit(record,tenantEntity); } if (record.getCreditType() == EnumScoreType.CONSUMPTION.getCode()) { - return payAddCredit(record,tenantEntity); + return payAddCredit(record,tenantEntity,wxCUserBasicInfo,hasBirthDateCredit); } if (record.getCreditType() == EnumScoreType.REDUCE_CREDIT.getCode()) { - return reduceCredit(record); + return reduceCredit(record,tenantEntity); } if (record.getCreditType() == EnumScoreType.MEM_IMPORT.getCode()) { + record.setRulesTenantId(tenantEntity.getTenantId()); return record.getCreditNum(); } if (record.getCreditType() == EnumScoreType.ACTIVITY_JOIN.getCode()) { - return reduceCredit(record); + return reduceCredit(record,tenantEntity); } if (record.getCreditType() == EnumScoreType.GAME_LES_CREDIT.getCode()) { - return reduceCredit(record); + return reduceCredit(record,tenantEntity); } if (record.getCreditType() == EnumScoreType.GAME_ADD_CREDIT.getCode()) { + record.setRulesTenantId(tenantEntity.getTenantId()); return record.getCreditNum(); } @@ -827,23 +814,27 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { } if (record.getCreditType() == EnumScoreType.QUESTION_ADD_CREDIT.getCode()) { + record.setRulesTenantId(tenantEntity.getTenantId()); return record.getCreditNum(); } if (record.getCreditType() == EnumScoreType.REFUND_CONSUMPTION.getCode()) { - return reduceCredit(record); + return reduceCredit(record,tenantEntity); } if (record.getCreditType() == EnumScoreType.REFUND_REDUCE_CREDIT.getCode()) { + record.setRulesTenantId(tenantEntity.getTenantId()); return record.getCreditNum(); } if (record.getCreditType() == EnumScoreType.POINT_CHANGE.getCode()) { + record.setRulesTenantId(tenantEntity.getTenantId()); return record.getCreditNum(); } return 0; } - private int reduceCredit(WxCreditHistory record) { + private int reduceCredit(WxCreditHistory record,TenantEntity tenantEntity) { + record.setRulesTenantId(tenantEntity.getTenantId()); int reduceCredit = record.getCreditNum(); return -reduceCredit; } @@ -855,6 +846,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { } // 1. 获取当前租户下积分的增加规则 WxScoreRules wxScoreRules = wxScoreRulesService.getCreditRules(tenantEntity); + record.setRulesTenantId(wxScoreRules.getTenantId()); // 2. 增长的积分 return wxScoreRules.getRule(EnumScoreType.LOGIN, WxScoreRules.SCORE); } @@ -866,6 +858,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { } // 1. 获取当前租户下积分的增加规则 WxScoreRules wxScoreRules = wxScoreRulesService.getCreditRules(tenantEntity); + record.setRulesTenantId(wxScoreRules.getTenantId()); // 2. 增长的积分 return wxScoreRules.getRule(EnumScoreType.SIGN_IN_DAY, WxScoreRules.SCORE); } @@ -877,6 +870,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { // } // 1. 获取当前租户下积分的增加规则 WxScoreRules wxScoreRules = wxScoreRulesService.getCreditRules(tenantEntity); + record.setRulesTenantId(wxScoreRules.getTenantId()); // 2. 增长的积分 return wxScoreRules.getRule(enumScoreType, WxScoreRules.SCORE); } @@ -887,6 +881,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { } // 1. 获取score rules WxScoreRules wxScoreRules = wxScoreRulesService.getCreditRules(tenantEntity); + record.setRulesTenantId(wxScoreRules.getTenantId()); // 2. 增长的积分 return wxScoreRules.getRule(EnumScoreType.BIND_CAR, WxScoreRules.SCORE); } @@ -894,6 +889,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { // private int personAddCredit(WxCreditHistory record,TenantEntity tenantEntity) { // // 1. 获取score rules // WxScoreRules wxScoreRules = wxScoreRulesService.getCreditRules(tenantEntity); +// record.setRulesTenantId(wxScoreRules.getTenantId()); // // 2. 增长的积分 // return wxScoreRules.getRule(EnumScoreType.WECHAT_PERSION, WxScoreRules.SCORE); // } @@ -901,6 +897,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { private int phoneAddCredit(WxCreditHistory record,TenantEntity tenantEntity) { // 1. 获取score rules WxScoreRules wxScoreRules = wxScoreRulesService.getCreditRules(tenantEntity); + record.setRulesTenantId(wxScoreRules.getTenantId()); // 2. 获取成长值 return wxScoreRules.getRule(EnumScoreType.WECHAT_PHONE, WxScoreRules.SCORE); } @@ -920,35 +917,25 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { return 0; // 1. 获取score rules WxScoreRules scoreRules = wxScoreRulesService.getCreditRules(tenantEntity); - // 2. 获取成长值 + record.setRulesTenantId(scoreRules.getTenantId()); + // 2. 获取积分 return scoreRules.getRule(EnumScoreType.COMPLETE_INFO, WxScoreRules.SCORE); } - private int spendCredit(WxCreditHistory record) { - WxMerchant wxMerchant = new WxMerchant(); - wxMerchant.setId(record.getMerchantId()); - wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); - List wxMerchantList = wxMerchantMapper.findList(wxMerchant); - if (wxMerchantList == null || wxMerchantList.size() == 0) { - throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_FOUND); - } - //根据商户id和花费金额计算需要新增的积分 - Map map = findByMerchantIdAndSpend(record.getMerchantId(), record.getSpendStr(), null); - return map.get("credit"); - } - - private int changeCredit(WxCreditHistory record) { + private int changeCredit(WxCreditHistory record,TenantEntity tenantEntity) { + record.setRulesTenantId(tenantEntity.getTenantId()); int changeCredit = record.getCreditNum(); return -changeCredit; } - private int payAddCredit(WxCreditHistory record,TenantEntity tenantEntity) { + private int payAddCredit(WxCreditHistory record,TenantEntity tenantEntity,WxCUserBasicInfo wxCUserBasicInfo,boolean hasBirthDateCredit) { int addCreditNumber = 0; // 订单金额为0时不计入 if (record.getCreditNum() != null && record.getCreditNum() == 0) return 0; // 1. 获取score rules WxScoreRules scoreRules = wxScoreRulesService.getCreditRules(tenantEntity); + record.setRulesTenantId(scoreRules.getTenantId()); // 2. 获取成长值 by id JSONObject payRule = WxScoreRules.getRuleObj(scoreRules.getRules(),EnumScoreType.CONSUMPTION); @@ -960,19 +947,16 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { for (int i = 0; i < busRules.size(); i++) { JSONObject bus = (JSONObject) busRules.get(i); Integer businessId1 = bus.getInteger("businessId"); - if (record.getBusinessId().equals(businessId1)) { + if (businessId1.equals(record.getBusinessId())) { busRule = bus; } if (businessId1.equals(Constant.default_business)) { busRuleOther = bus; } } - if (busRule == null) { - busRule = busRuleOther; - } } if (busRule == null) { - busRule = payRule; + busRule = busRuleOther; } Double priceCondition = busRule.getDouble(WxScoreRules.STEP) * 100; // 元->分 int baseScore = busRule.getInteger(WxScoreRules.SCORE); // 消费增长积分 @@ -986,6 +970,18 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { log.info("CREDIT:" + busRule.toJSONString() + "\nAddCredit: 0, not touch credit limit"); return 0; } + //积分倍率 + try { + addCreditNumber = CreditUtil.calUserCredit(addCreditNumber, wxCUserBasicInfo, tenantEntity, wxScoreRulesService,wxLevelConfigMapper); + if (Objects.nonNull(CreditUtil.getIsBirthDayScale())) { + hasBirthDateCredit = true; + } + } catch (Exception e) { + logger.error("积分倍率计算异常",e); + } finally { + CreditUtil.clear(); + } + return addCreditNumber; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java index 8a8dd1c64..71fda2fea 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScoreRulesServiceImpl.java @@ -343,7 +343,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { updateScore(user.getId(), tenantEntity,addScoreNumber); // 3. 记录历史 - recordScoreHistory(addScoreNumber, tenantEntity, user.getId(), EnumScoreType.LOGIN); + recordScoreHistory(tenantEntity,scoreRules.getTenantId(),addScoreNumber, user.getId(), EnumScoreType.LOGIN); return addScoreNumber; } @@ -373,12 +373,9 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { busRuleOther = bus; } } - if(busRule == null) { - busRule = busRuleOther; - } } - if (busRule == null) { - busRule = payRule; + if(busRule == null) { + busRule = busRuleOther; } Double priceCondition = busRule.getDouble(WxScoreRules.STEP) * 100; // 元->分 int baseScore = busRule.getInteger(WxScoreRules.SCORE); // 消费增长积分 @@ -401,7 +398,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { updateScore(order.getCUserId(),order, addScoreNumber); // 6. 记录历史 - recordPayScoreHistory(addScoreNumber, order, EnumScoreType.CONSUMPTION); + recordPayScoreHistory(order,scoreRules.getTenantId(),addScoreNumber, EnumScoreType.CONSUMPTION); return addScoreNumber; } @@ -426,7 +423,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { updateScore(user.getId(),tenantEntity, addScoreNumber); // 4. 记录历史 - recordScoreHistory(addScoreNumber, tenantEntity, user.getId(), EnumScoreType.BIND_CAR); + recordScoreHistory(tenantEntity,scoreRules.getTenantId(),addScoreNumber, user.getId(), EnumScoreType.BIND_CAR); } return addScoreNumber; @@ -444,7 +441,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { // updateScore(user.getId(),tenantEntity, addScoreNumber); // // // 4. 记录历史 -// recordScoreHistory(addScoreNumber, tenantEntity, user.getId(), EnumScoreType.WECHAT_PERSION); +// recordScoreHistory(tenantEntity,scoreRules.getTenantId(),addScoreNumber, user.getId(), EnumScoreType.WECHAT_PERSION); // return addScoreNumber; // } @@ -460,7 +457,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { updateScore(user.getId(),tenantEntity, addScoreNumber); // 4. 记录历史 - recordScoreHistory(addScoreNumber, tenantEntity, user.getId(), EnumScoreType.WECHAT_PHONE); + recordScoreHistory(tenantEntity,scoreRules.getTenantId(),addScoreNumber, user.getId(), EnumScoreType.WECHAT_PHONE); return addScoreNumber; } @@ -488,7 +485,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { updateScore(user.getId(),tenantEntity, addScoreNumber); // 4. 记录历史 - recordScoreHistory(addScoreNumber, tenantEntity, user.getId(), EnumScoreType.COMPLETE_INFO); + recordScoreHistory(tenantEntity,scoreRules.getTenantId(),addScoreNumber, user.getId(), EnumScoreType.COMPLETE_INFO); return addScoreNumber; } @@ -517,7 +514,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { // } // 2. 记录历史 - recordReduceScoreHistory(scoreNum, reason, tenantEntity, userInfo.getId(), EnumScoreType.MEM_REDUCE); + recordReduceScoreHistory(tenantEntity,scoreNum, reason, userInfo.getId(), EnumScoreType.MEM_REDUCE); return score; } @@ -526,7 +523,7 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { WxScoreHistory history = new WxScoreHistory(); history.setId(idWorker.nextId()); history.setTenantId(tenantEntity.getFinalTenantId()); - history.setFinalTenantId(tenantEntity.getFinalTenantId()); + history.setRulesTenantId(tenantEntity.getTenantId()); history.setCUserId(userInfo.getId()); history.setCreateDate(new Date()); history.setScoreType(wechatPhone.getCode()); @@ -534,25 +531,25 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { wxScoreHistoryMapper.insert(history); } - private void recordScoreHistory(int addScoreNumber, TenantEntity tenantEntity, Long id, EnumScoreType wechatPhone) { + private void recordScoreHistory(TenantEntity tenantEntity,String rulesTenantId,int addScoreNumber,Long cuserId, EnumScoreType wechatPhone) { final IdWorker idWorker = IdWorker.get(); WxScoreHistory history = new WxScoreHistory(); history.setId(idWorker.nextId()); history.setTenantId(tenantEntity.getFinalTenantId()); - history.setFinalTenantId(tenantEntity.getFinalTenantId()); - history.setCUserId(id); + history.setRulesTenantId(rulesTenantId); + history.setCUserId(cuserId); history.setCreateDate(new Date()); history.setScoreType(wechatPhone.getCode()); history.setScoreAmount(addScoreNumber); wxScoreHistoryMapper.insert(history); } - private void recordPayScoreHistory(int addScoreNumber, WxOrder order, EnumScoreType wechatPhone) { + private void recordPayScoreHistory(WxOrder order,String rulesTenantId,int addScoreNumber, EnumScoreType wechatPhone) { final IdWorker idWorker = IdWorker.get(); WxScoreHistory history = new WxScoreHistory(); history.setId(idWorker.nextId()); history.setTenantId(order.getFinalTenantId()); - history.setFinalTenantId(order.getFinalTenantId()); + history.setRulesTenantId(rulesTenantId); history.setCUserId(order.getCUserId()); history.setCreateDate(new Date()); history.setScoreType(EnumScoreType.CONSUMPTION.getCode()); @@ -565,12 +562,12 @@ public class WxScoreRulesServiceImpl implements WxScoreRulesService { wxScoreHistoryMapper.insert(history); } - private void recordReduceScoreHistory(int reduceScore, String reason, TenantEntity tenantEntity, Long id, EnumScoreType wechatPhone) { + private void recordReduceScoreHistory(TenantEntity tenantEntity,int reduceScore, String reason, Long id, EnumScoreType wechatPhone) { final IdWorker idWorker = IdWorker.get(); WxScoreHistory history = new WxScoreHistory(); history.setId(idWorker.nextId()); history.setTenantId(tenantEntity.getFinalTenantId()); - history.setFinalTenantId(tenantEntity.getFinalTenantId()); + history.setRulesTenantId(tenantEntity.getTenantId()); history.setCUserId(id); history.setCreateDate(new Date()); history.setScoreType(wechatPhone.getCode()); diff --git a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml index 941b14848..cb174f551 100644 --- a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml @@ -4,6 +4,7 @@ + @@ -22,7 +23,7 @@ - `id`,`tenant_id`,`c_user_id`,`credit_amount`,`credit_num`,`credit_type`,`create_date`,`receipt_url`,`operator_type`,`operator_id`,`merchant_id`,`coupon_id`,`business_id`,`spend`,`change_purpose`,`ticket_number`,`buser_id` + `id`,`tenant_id`,`rules_tenant_id`,`c_user_id`,`credit_amount`,`credit_num`,`credit_type`,`create_date`,`receipt_url`,`operator_type`,`operator_id`,`merchant_id`,`coupon_id`,`business_id`,`spend`,`change_purpose`,`ticket_number`,`buser_id` diff --git a/mallinkService/src/main/resources/mapper/WxScoreHistoryMapper.xml b/mallinkService/src/main/resources/mapper/WxScoreHistoryMapper.xml index 9699f10d3..1db417b7c 100644 --- a/mallinkService/src/main/resources/mapper/WxScoreHistoryMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxScoreHistoryMapper.xml @@ -4,6 +4,7 @@ + @@ -16,7 +17,7 @@ - `id`,`tenant_id`,`c_user_id`,`create_date`,`score_type`,`valid_date`,`order_id`,`pay_type`,`pay_amount`,`score_amount`,`reason` + `id`,`tenant_id`,`rules_tenant_id`,`c_user_id`,`create_date`,`score_type`,`valid_date`,`order_id`,`pay_type`,`pay_amount`,`score_amount`,`reason`