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

更改商户收款账号绑定提示,打标签定时,拼团bug

release_toaliyun_real
xiaohanzi пре 5 година
родитељ
комит
1080c20198
5 измењених фајлова са 12 додато и 47 уклоњено
  1. +4
    -3
      mallinkBApi/src/main/java/com/iformall/controller/BaseController.java
  2. +1
    -12
      mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserTagsSchedule.java
  3. +0
    -7
      mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java
  4. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java
  5. +5
    -23
      mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml

+ 4
- 3
mallinkBApi/src/main/java/com/iformall/controller/BaseController.java Прегледај датотеку

@@ -76,10 +76,11 @@ public class BaseController {
} }


public WxMerchantBUser getUser() { public WxMerchantBUser getUser() {
Long userId = getBuser().getUserId();
WxBuser buser = getBuser();
Long userId = buser.getUserId();
WxMerchantBUser user = wxMerchantBUserService.getById(userId); WxMerchantBUser user = wxMerchantBUserService.getById(userId);
if (user == null) { if (user == null) {
throw new MallinkException(ErrorCode.USER_IS_EMPTY);
throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(),"BUser[id:"+buser.getId()+",userId:"+userId+"]未查询到WxMerchantBUser。请联系管理员或者重新登陆.");
} }
return user; return user;
} }
@@ -88,7 +89,7 @@ public class BaseController {
Long id = getBuserId(); Long id = getBuserId();
WxBuser user = wxBuserService.getById(id); WxBuser user = wxBuserService.getById(id);
if (user == null) { if (user == null) {
throw new MallinkException(ErrorCode.USER_IS_EMPTY);
throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(),"BUser[id:"+id+"]未查询到记录, 请重新登陆,并完全授权微信个人信息以及手机号授权.");
} }
return user; return user;
} }


+ 1
- 12
mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserTagsSchedule.java Прегледај датотеку

@@ -48,21 +48,10 @@ public class WxCUserTagsSchedule {
wxCUserBasicInfo.setFinalTenantId(mall.getParentTenantId()); wxCUserBasicInfo.setFinalTenantId(mall.getParentTenantId());
} }
Date curDate = new Date(); Date curDate = new Date();
Calendar startC = Calendar.getInstance();
startC.setTime(curDate);
startC.add(Calendar.DAY_OF_YEAR, -30);
Calendar endC = Calendar.getInstance();
endC.setTime(curDate);
endC.add(Calendar.DAY_OF_YEAR, -5);
//5天内未扫描的,且只扫描1个月内未扫描的
wxCUserBasicInfo.setScanStartTime(startC.getTime());
wxCUserBasicInfo.setScanEndTime(endC.getTime());
//活跃时间在10天内的 //活跃时间在10天内的
Calendar startA = Calendar.getInstance(); Calendar startA = Calendar.getInstance();
startA.setTime(curDate); startA.setTime(curDate);
startA.add(Calendar.DAY_OF_YEAR, -10);
startA.add(Calendar.DAY_OF_YEAR, -1);
wxCUserBasicInfo.setActiveStartTime(startA.getTime()); wxCUserBasicInfo.setActiveStartTime(startA.getTime());
wxCUserBasicInfo.setActiveEndTime(curDate); wxCUserBasicInfo.setActiveEndTime(curDate);
int pageIndex = 1; int pageIndex = 1;


+ 0
- 7
mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java Прегледај датотеку

@@ -110,13 +110,6 @@ public class WxCUserBasicInfo extends TenantEntity {


@io.swagger.annotations.ApiModelProperty(value = "状态0正常1锁定", name = "status") @io.swagger.annotations.ApiModelProperty(value = "状态0正常1锁定", name = "status")
private Integer status; private Integer status;
@io.swagger.annotations.ApiModelProperty(value = "标签扫描时间", name = "tagScanTime")
private Date tagScanTime;
@TableField(exist = false)
private Date scanStartTime;
@TableField(exist = false)
private Date scanEndTime;


@TableField(exist = false) @TableField(exist = false)
@Excel(name="标签",width = 50,orderNum = "10") @Excel(name="标签",width = 50,orderNum = "10")


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

@@ -235,8 +235,8 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService {
//拼团取消 //拼团取消
//temp.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_BREAK.getCode()); //temp.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_BREAK.getCode());
//拼团失败。定时会处理退款
temp.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_FAILD.getCode());
//拼团取消。定时会处理退款
temp.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_CANCEL.getCode());
wxOrderMapper.updateById(temp); wxOrderMapper.updateById(temp);
} }
} }


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

@@ -26,13 +26,12 @@
<result column="act_record" jdbcType="INTEGER" property="actRecord"/> <result column="act_record" jdbcType="INTEGER" property="actRecord"/>
<result column="score_date" jdbcType="TIMESTAMP" property="scoreDate"/> <result column="score_date" jdbcType="TIMESTAMP" property="scoreDate"/>
<result column="status" jdbcType="INTEGER" property="status"/> <result column="status" jdbcType="INTEGER" property="status"/>
<result column="tag_scan_time" jdbcType="TIMESTAMP" property="tagScanTime"/>
</resultMap> </resultMap>


<sql id="allColumns"> <sql id="allColumns">
distinct wcubi.`id`,wcubi.`phone`,wcubi.`birthdate`,wcubi.`education`,wcubi.`sex`,wcubi.`email`, distinct wcubi.`id`,wcubi.`phone`,wcubi.`birthdate`,wcubi.`education`,wcubi.`sex`,wcubi.`email`,
wcubi.`address`,wcubi.`poins`,wcubi.`tag_id`,wcubi.`create_date`,wcubi.`update_date`, wcubi.`address`,wcubi.`poins`,wcubi.`tag_id`,wcubi.`create_date`,wcubi.`update_date`,
wcubi.`final_tenant_id`,wcubi.`name`,wcubi.`nick_name`,wcubi.`tag_scan_time`,
wcubi.`final_tenant_id`,wcubi.`name`,wcubi.`nick_name`,
wcubi.`avatar_url`,wcubi.`credit`,wcubi.`active_time`,wcubi.`login_count`,wcubi.`act_record` wcubi.`avatar_url`,wcubi.`credit`,wcubi.`active_time`,wcubi.`login_count`,wcubi.`act_record`
,(select level from wx_level_config ,(select level from wx_level_config
where poins >= points and tenant_id=wcubi.final_tenant_id where poins >= points and tenant_id=wcubi.final_tenant_id
@@ -40,7 +39,7 @@
</sql> </sql>
<sql id="allSimpleColumns"> <sql id="allSimpleColumns">
`id`,`phone`,`birthdate`,`education`,`sex`,`email`,`address`,`poins`,`tag_id`,`tag_scan_time`,
`id`,`phone`,`birthdate`,`education`,`sex`,`email`,`address`,`poins`,`tag_id`,
`create_date`,`update_date`,`tenant_id`,`parent_tenant_id`,`name`,`nick_name`,`credit`,`active_time`,`act_record` `create_date`,`update_date`,`tenant_id`,`parent_tenant_id`,`name`,`nick_name`,`credit`,`active_time`,`act_record`
</sql> </sql>


@@ -108,11 +107,7 @@
</if> </if>
<if test=" null != startTime and null!=endTime"> <if test=" null != startTime and null!=endTime">
and wcubi.`create_date` between #{startTime} and #{endTime} and wcubi.`create_date` between #{startTime} and #{endTime}
</if>

<if test=" null != scanStartTime and null!=scanEndTime">
and wcubi.`tag_scan_time` between #{scanStartTime} and #{scanEndTime}
</if>
</if>
<if test=" null != activeStartTime and null!=activeEndTime"> <if test=" null != activeStartTime and null!=activeEndTime">
and wcubi.`active_time` between #{activeStartTime} and #{activeEndTime} and wcubi.`active_time` between #{activeStartTime} and #{activeEndTime}
@@ -210,10 +205,6 @@
</if> </if>
<if test=" null != basicInfo.startTime and null != basicInfo.endTime"> <if test=" null != basicInfo.startTime and null != basicInfo.endTime">
and wcubi.`create_date` between #{basicInfo.startTime} and #{basicInfo.endTime} and wcubi.`create_date` between #{basicInfo.startTime} and #{basicInfo.endTime}
</if>

<if test=" null != basicInfo.scanStartTime and null!=basicInfo.scanEndTime">
and wcubi.`tag_scan_time` between #{basicInfo.scanStartTime} and #{basicInfo.scanEndTime}
</if> </if>
<if test=" null != basicInfo.activeStartTime and null!=basicInfo.activeEndTime"> <if test=" null != basicInfo.activeStartTime and null!=basicInfo.activeEndTime">
@@ -406,7 +397,7 @@


<sql id="allColumnsOfScoreList"> <sql id="allColumnsOfScoreList">
distinct cub.id,cub.phone,cub.birthdate,cub.education,cub.sex,cub.email,cub.address,cub.poins,cub.tag_id, distinct cub.id,cub.phone,cub.birthdate,cub.education,cub.sex,cub.email,cub.address,cub.poins,cub.tag_id,
cub.create_date,cub.update_date,cub.name,cub.level,cub.nick_name,cub.score_date,cub.final_tenant_id,cub.tag_scan_time
cub.create_date,cub.update_date,cub.name,cub.level,cub.nick_name,cub.score_date,cub.final_tenant_id
</sql> </sql>


<select id="findListByScore" parameterType="com.iformall.domain.dto.WxCUserBasicInfoDto" resultMap="BaseResultMap"> <select id="findListByScore" parameterType="com.iformall.domain.dto.WxCUserBasicInfoDto" resultMap="BaseResultMap">
@@ -621,12 +612,11 @@
<result column="credit" jdbcType="INTEGER" property="credit"/> <result column="credit" jdbcType="INTEGER" property="credit"/>
<result column="tags" jdbcType="VARCHAR" property="tags"/> <result column="tags" jdbcType="VARCHAR" property="tags"/>
<result column="active_time" jdbcType="TIMESTAMP" property="activeTime"/> <result column="active_time" jdbcType="TIMESTAMP" property="activeTime"/>
<result column="tag_scan_time" jdbcType="TIMESTAMP" property="tagScanTime"/>
</resultMap> </resultMap>


<sql id="allVoColumns"> <sql id="allVoColumns">
distinct cu.`id`,cu.`phone`,cu.`birthdate`,cu.`education`,cu.`sex`,cu.`email`,cu.`address`,cu.`poins`,cu.`tag_id`, distinct cu.`id`,cu.`phone`,cu.`birthdate`,cu.`education`,cu.`sex`,cu.`email`,cu.`address`,cu.`poins`,cu.`tag_id`,
cu.`create_date`,cu.`update_date`,cu.`name`,cu.`level`,cu.`nick_name`,cu.`tag_scan_time`,
cu.`create_date`,cu.`update_date`,cu.`name`,cu.`level`,cu.`nick_name`,
cut.`tags`,cu.`credit`,cu.`active_time`,cu.`act_record`,cu.`final_tenant_id` cut.`tags`,cu.`credit`,cu.`active_time`,cu.`act_record`,cu.`final_tenant_id`
</sql> </sql>


@@ -692,10 +682,6 @@
and cu.`create_date` between #{startTime} and #{endTime} and cu.`create_date` between #{startTime} and #{endTime}
</if> </if>
<if test=" null != scanStartTime and null!=scanEndTime">
and wcubi.`tag_scan_time` between #{scanStartTime} and #{scanEndTime}
</if>
<if test=" null != activeStartTime and null!=activeEndTime"> <if test=" null != activeStartTime and null!=activeEndTime">
and wcubi.`active_time` between #{activeStartTime} and #{activeEndTime} and wcubi.`active_time` between #{activeStartTime} and #{activeEndTime}
</if> </if>
@@ -772,10 +758,6 @@
and cu.`create_date` between #{basicInfo.startTime} and #{basicInfo.endTime} and cu.`create_date` between #{basicInfo.startTime} and #{basicInfo.endTime}
</if> </if>
<if test=" null != basicInfo.scanStartTime and null!=basicInfo.scanEndTime">
and wcubi.`tag_scan_time` between #{basicInfo.scanStartTime} and #{basicInfo.scanEndTime}
</if>
<if test=" null != basicInfo.activeStartTime and null!=basicInfo.activeEndTime"> <if test=" null != basicInfo.activeStartTime and null!=basicInfo.activeEndTime">
and wcubi.`active_time` between #{basicInfo.activeStartTime} and #{basicInfo.activeEndTime} and wcubi.`active_time` between #{basicInfo.activeStartTime} and #{basicInfo.activeEndTime}
</if> </if>


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