| @@ -14,3 +14,7 @@ left join mall_user_role mur on mui.id = mur.uid | |||||
| where mui.is_admin = 1 and mur.role_id is not null GROUP BY mur.role_id; | where mui.is_admin = 1 and mur.role_id is not null GROUP BY mur.role_id; | ||||
| ALTER TABLE `mallink`.`wx_template_msg` | |||||
| ADD COLUMN `on_off` int(255) NOT NULL DEFAULT 0 COMMENT '开关(0/1)' AFTER `update_date`; | |||||
| @@ -98,12 +98,12 @@ public class BaseMyBatisConfiguration { | |||||
| wxCouponOrderSharding.setRule(EnumShardingRule.HASH.getCode()); | wxCouponOrderSharding.setRule(EnumShardingRule.HASH.getCode()); | ||||
| shardingList.add(wxCouponOrderSharding); | shardingList.add(wxCouponOrderSharding); | ||||
| ShardingSphere wxCouponSendSharding = new ShardingSphere(); | |||||
| wxCouponSendSharding.setColumn("tenant_id"); | |||||
| wxCouponSendSharding.setTableName("wx_coupon_send"); | |||||
| wxCouponSendSharding.setCount(100); | |||||
| wxCouponSendSharding.setRule(EnumShardingRule.HASH.getCode()); | |||||
| shardingList.add(wxCouponSendSharding); | |||||
| // ShardingSphere wxCouponSendSharding = new ShardingSphere(); | |||||
| // wxCouponSendSharding.setColumn("tenant_id"); | |||||
| // wxCouponSendSharding.setTableName("wx_coupon_send"); | |||||
| // wxCouponSendSharding.setCount(100); | |||||
| // wxCouponSendSharding.setRule(EnumShardingRule.HASH.getCode()); | |||||
| // shardingList.add(wxCouponSendSharding); | |||||
| ShardingSphere wxOrderGroupSharding = new ShardingSphere(); | ShardingSphere wxOrderGroupSharding = new ShardingSphere(); | ||||
| wxOrderGroupSharding.setColumn("tenant_id"); | wxOrderGroupSharding.setColumn("tenant_id"); | ||||
| @@ -1048,6 +1048,6 @@ | |||||
| </select>--> | </select>--> | ||||
| <update id="cuserOldToNew" statementType="CALLABLE" > | <update id="cuserOldToNew" statementType="CALLABLE" > | ||||
| {call cuser_old_to_new(#{oldCuserId},#{newCuserId})} | |||||
| {call cuser_old_to_new(#{oldCuserId},#{newCuserId},#{tableIndex})} | |||||
| </update> | </update> | ||||
| </mapper> | </mapper> | ||||
| @@ -1320,7 +1320,7 @@ | |||||
| javaType="java.util.List" | javaType="java.util.List" | ||||
| select="com.iformall.mapper.WxCouponMerchantMapper.findMerchantVoList" > | select="com.iformall.mapper.WxCouponMerchantMapper.findMerchantVoList" > | ||||
| </collection> | </collection> | ||||
| <collection column="{cardId=id}" property="cardSpendList" | |||||
| <collection column="{cardId=id,tenantId=tenant_id}" property="cardSpendList" | |||||
| ofType="com.iformall.domain.vo.WxCardSpendVo" | ofType="com.iformall.domain.vo.WxCardSpendVo" | ||||
| javaType="java.util.List" | javaType="java.util.List" | ||||
| select="com.iformall.mapper.WxCardSpendMapper.findCardSpendVoList" > | select="com.iformall.mapper.WxCardSpendMapper.findCardSpendVoList" > | ||||