Przeglądaj źródła

cuser

release_toaliyun_real
xhxu 5 lat temu
rodzic
commit
12a1a30bed
9 zmienionych plików z 32 dodań i 1 usunięć
  1. +6
    -0
      mallinkAdmin/src/main/resources/db/migration/V202009041200__commercialPreferential.sql
  2. +1
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java
  3. +1
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java
  4. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java
  5. +3
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java
  6. +2
    -0
      mallinkService/src/main/java/com/iformall/service/WxCUserService.java
  7. +5
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java
  8. +9
    -0
      mallinkService/src/main/resources/mapper/WxCUserMapper.xml
  9. +2
    -1
      mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml

+ 6
- 0
mallinkAdmin/src/main/resources/db/migration/V202009041200__commercialPreferential.sql Wyświetl plik

@@ -24,6 +24,12 @@ update wx_c_user_basic_info set tenant_id = concat(",",final_tenant_id,",");



ALTER TABLE `wx_c_user`
MODIFY COLUMN `tenant_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID' AFTER `id`,
MODIFY COLUMN `parent_tenant_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`,
MODIFY COLUMN `open_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信openId' AFTER `parent_tenant_id`,
MODIFY COLUMN `union_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '微信unionId' AFTER `open_id`,
MODIFY COLUMN `user_id` bigint(20) DEFAULT NULL COMMENT '用户ID' AFTER `active_time`;





+ 1
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java Wyświetl plik

@@ -87,6 +87,7 @@ public class WxMsgValidationcodeController extends BaseController {
user.setVerifyCodePhone(phone);
user.setUpdateDate(new Date());
wxCUserService.saveOrUpdate(user);
wxCUserService.delForUserIdOnly(user.getId(),user.getUserId(),user.getTenantId());
// wxCUserService.assureUserIdOnly(user.getId(),);
wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_PHONE,user);



+ 1
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java Wyświetl plik

@@ -681,6 +681,7 @@ public class WxUserGrantController extends BaseController {
user.setUserId(userBasicId);
}
wxCUserService.saveOrUpdate(user);
wxCUserService.delForUserIdOnly(user.getId(),user.getUserId(),user.getTenantId());
wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_PHONE, user);
}


+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java Wyświetl plik

@@ -72,6 +72,9 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable {
@io.swagger.annotations.ApiModelProperty(value="内容类型(0:小程序页面类型,1:富文本类型)",name="contentType")
private Integer contentType;

@TableField(exist = false)
private String detail;

@TableField(exist = false)
private String salePriceStr;



+ 3
- 0
mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java Wyświetl plik

@@ -8,6 +8,7 @@ import com.iformall.domain.dto.WxCUserBasicInfoDto;
import com.iformall.domain.po.WxCUser;
import com.iformall.domain.po.base.BaseCUserEntity;
import com.iformall.domain.vo.UserCountVo;
import org.apache.ibatis.annotations.Param;

public interface WxCUserMapper extends CommonMapper<WxCUser, Long> {

@@ -30,4 +31,6 @@ public interface WxCUserMapper extends CommonMapper<WxCUser, Long> {
List<Map<String, Object>> checkCountByTenantOpenId();

void updateUserId(WxCUser user);

void delForUserIdOnly(@Param("id")Long id, @Param("userId")Long userId,@Param("tenantId")String tenantId);
}

+ 2
- 0
mallinkService/src/main/java/com/iformall/service/WxCUserService.java Wyświetl plik

@@ -139,4 +139,6 @@ public interface WxCUserService {
int addCredit(WxCUser wxCUser, EnumScoreType enumScoreType);

void updateUserId(WxCUser user);

void delForUserIdOnly(Long id, Long userId, String tenantId);
}

+ 5
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java Wyświetl plik

@@ -344,5 +344,10 @@ public class WxCUserServiceImpl implements WxCUserService {
wxCUserMapper.updateUserId(user);
}

@Override
public void delForUserIdOnly(Long id, Long userId, String tenantId) {
wxCUserMapper.delForUserIdOnly(id,userId,tenantId);
}


}

+ 9
- 0
mallinkService/src/main/resources/mapper/WxCUserMapper.xml Wyświetl plik

@@ -370,4 +370,13 @@
where id = #{id}
</update>

<update id="delForUserIdOnly">
update wx_c_user set update_date=now(),
tenant_id = IF(tenant_id is null ,null,CONCAT(tenant_id,"_del")),
parent_tenant_id = IF(parent_tenant_id is null ,null,CONCAT(parent_tenant_id,"_del")),
open_id = IF(open_id is null ,null,CONCAT(open_id,"_del")),
union_id = IF(union_id is null ,null,CONCAT(union_id,"_del"))
where user_id = #{userId} and tenant_id = #{tenantId} and id != #{id}
</update>

</mapper>

+ 2
- 1
mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml Wyświetl plik

@@ -152,7 +152,7 @@

<sql id="CouponChannelVoColumns">
<include refid="allColumns" />,
c.remain_inventory,c.inventory,c.cover_img,c.sub_title,c.sale_price,
c.remain_inventory,c.inventory,c.cover_img,c.sub_title,c.sale_price,c.detail,
c.use_price,c.price,c.unit,c.use_limit_quantity,c.send_type,c.support_transfer,c.press_limit_num,c.auto_refund,c.conditions,
c.valid_type,c.valid_start_date,c.valid_end_date,c.valid_days,c.credit_price,c.content_type,c.source_type
</sql>
@@ -181,6 +181,7 @@
<result column="use_price" jdbcType="INTEGER" property="usePrice"/>
<result column="price" jdbcType="INTEGER" property="price"/>
<result column="unit" jdbcType="INTEGER" property="unit"/>
<result column="detail" jdbcType="VARCHAR" property="detail"/>
<result column="use_limit_quantity" jdbcType="INTEGER" property="useLimitQuantity"/>
<result column="send_type" jdbcType="INTEGER" property="sendType"/>
<result column="support_transfer" jdbcType="INTEGER" property="supportTransfer"/>


Ładowanie…
Anuluj
Zapisz