Browse Source

Merge branch 'for_member_only' of https://git.youlane.cn/server/formallProject into for_member_only

release_toaliyun_real
xiaohanzi 5 years ago
parent
commit
71daa9da61
6 changed files with 56 additions and 21 deletions
  1. +2
    -0
      mallinkCApi/src/main/java/com/iformall/controller/BaseController.java
  2. +36
    -9
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java
  3. +10
    -10
      mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java
  4. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java
  5. +2
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java
  6. +3
    -1
      mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml

+ 2
- 0
mallinkCApi/src/main/java/com/iformall/controller/BaseController.java View File

@@ -192,6 +192,8 @@ public class BaseController {
basicInfo.setPhone(phone);
basicInfo.setNickName(user.getNickName());
basicInfo.setSex(user.getGender());
basicInfo.setLoginCount(1);
basicInfo.setActiveTime(cur);
basicInfo.setCreateDate(cur);
basicInfo.setUpdateDate(cur);
wxCUserBasicInfoService.save(basicInfo);


+ 36
- 9
mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java View File

@@ -65,12 +65,16 @@ public class WxCouponOrderController extends BaseController {
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true),
})
public ResultData list(@ModelAttribute WxCouponOrder wxCouponOrder, Integer pageNum, Integer pageSize) {

WxCUser user = getUser();
if (user.getUserId() == null) {
logger.error("手机号为空,请授权手机号");
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "手机号为空,请授权手机号");
}
if (pageNum == null || pageSize == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
}
if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderCVo();
wxCouponOrder.setCUserId(getUserId());
wxCouponOrder.setCUserId(user.getUserId());
if (wxCouponOrder.getCouponOrderStatus() == null)
wxCouponOrder.setSortColumns(BaseEntity.SortField.CreateDate_DESC, BaseEntity.SortField.Id_DESC);
else if (wxCouponOrder.getCouponOrderStatus() == EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode())
@@ -103,6 +107,11 @@ public class WxCouponOrderController extends BaseController {
@ApiImplicitParam(name = "couponOrderId", value = "券ID", dataType = "string", paramType = "query", required = true)
})
public ResultData detail(String couponOrderId) {
WxCUser user = getUser();
if (user.getUserId() == null) {
logger.error("手机号为空,请授权手机号");
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "手机号为空,请授权手机号");
}

if (couponOrderId == null || couponOrderId.equalsIgnoreCase(Constant.UNDEFINED)) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
@@ -112,7 +121,7 @@ public class WxCouponOrderController extends BaseController {
if (wxCouponOrderCVo == null) {
return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL);
}
if (!wxCouponOrderCVo.getCUserId().equals(getUserId())) {
if (!wxCouponOrderCVo.getCUserId().equals(user.getUserId())) {
return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL);
}
WxCouponCVo wxCouponCVo = null;
@@ -237,6 +246,11 @@ public class WxCouponOrderController extends BaseController {
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true),
})
public ResultData cardList(@ModelAttribute WxCardCVo cardCVo, Integer pageNum, Integer pageSize) {
WxCUser user = getUser();
if (user.getUserId() == null) {
logger.error("手机号为空,请授权手机号");
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "手机号为空,请授权手机号");
}

if (pageNum == null || pageSize == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
@@ -245,7 +259,7 @@ public class WxCouponOrderController extends BaseController {
cardCVo = new WxCardCVo();
}
cardCVo.updateTenantInfo(getTenantInfo());
cardCVo.setOwnerId(getUserId());
cardCVo.setOwnerId(user.getUserId());
if(StringUtils.isNotBlank(cardCVo.getStatusStr())) {
String [] statusAttr = cardCVo.getStatusStr().split(",");
List<Integer> tmpList = new ArrayList<Integer>();
@@ -272,12 +286,16 @@ public class WxCouponOrderController extends BaseController {
@ApiImplicitParam(name = "couponOrderId", value = "券ID", dataType = "string", paramType = "query", required = true)
})
public ResultData cardDetail(String couponOrderId) {

WxCUser user = getUser();
if (user.getUserId() == null) {
logger.error("手机号为空,请授权手机号");
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "手机号为空,请授权手机号");
}
if (couponOrderId == null || couponOrderId.equalsIgnoreCase(Constant.UNDEFINED) ) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
}

return wxCouponOrderService.cardDetailCUserVo(getUserId(), couponOrderId);
return wxCouponOrderService.cardDetailCUserVo(user.getUserId(), couponOrderId);
}

@ApiOperation(value = "卡转赠领取")
@@ -287,6 +305,11 @@ public class WxCouponOrderController extends BaseController {
@ApiImplicitParam(name = "cUserId", value = "转赠者", dataType = "Long", paramType = "query", required = true),
})
public ResultData cardAccept(@RequestBody WxCouponOrder wxCouponOrder) {
WxCUser user = getUser();
if (user.getUserId() == null) {
logger.error("手机号为空,请授权手机号");
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "手机号为空,请授权手机号");
}
//coupon_order_id判断
Long id = wxCouponOrder.getId();
if (id == null) {
@@ -298,7 +321,7 @@ public class WxCouponOrderController extends BaseController {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "cUserId不能为空");
}
//当前领取人
wxCouponOrder.setOwnerId(getUserId());
wxCouponOrder.setOwnerId(user.getUserId());
//转赠者与当前领取人是否为同一个
if (cUserId.equals(wxCouponOrder.getOwnerId())) {
logger.info("转赠人与卡所有者相同");
@@ -316,7 +339,11 @@ public class WxCouponOrderController extends BaseController {
@ApiImplicitParam(name = "cUserId", value = "转赠者", dataType = "Long", paramType = "query", required = true),
})
public ResultData queryCardStatus(@ModelAttribute WxCouponOrder wxCouponOrder) {

WxCUser user = getUser();
if (user.getUserId() == null) {
logger.error("手机号为空,请授权手机号");
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "手机号为空,请授权手机号");
}
//coupon_order_id判断
Long id = wxCouponOrder.getId();
if (id == null) {
@@ -332,7 +359,7 @@ public class WxCouponOrderController extends BaseController {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "updateDate不能为空");
}
//当前领取人
wxCouponOrder.setOwnerId(getUserId());
wxCouponOrder.setOwnerId(user.getUserId());
return wxCouponOrderService.queryCardStatus(wxCouponOrder);
}



+ 10
- 10
mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java View File

@@ -366,7 +366,7 @@ public class WxUserGrantController extends BaseController {
extraInfo.put("systemInfo", JSONObject.parseObject(systemInfo));
newUser.setExtraInfo(extraInfo.toJSONString());
}
newUser.setLoginCount(0);
newUser.setLoginCount(1);

userTokenService.saveOrUpdate(newUser);

@@ -628,15 +628,15 @@ public class WxUserGrantController extends BaseController {
user.setCountryCode(phoneNoInfo.getCountryCode());
if (isFirstPhone) {
//检查是否存在会员信息 如果有 赋值积分
WxCUserBasicInfo basicInfo = wxCUserBasicInfoService.findInfoByPhone(tenantEntity, user.getPhone());
if (basicInfo != null ) {
int credit = user.getCredit() == null ? 0 : user.getCredit();
int score = user.getScore() == null ? 0 : user.getScore();
int memScore = basicInfo.getPoins() == null ? 0 : basicInfo.getPoins();
int memCredit = basicInfo.getCredit() == null ? 0 : basicInfo.getCredit();
user.setCredit(memCredit + credit);
user.setScore(memScore + score);
}
// WxCUserBasicInfo basicInfo = wxCUserBasicInfoService.findInfoByPhone(tenantEntity, user.getPhone());
// if (basicInfo != null ) {
// int credit = user.getCredit() == null ? 0 : user.getCredit();
// int score = user.getScore() == null ? 0 : user.getScore();
// int memScore = basicInfo.getPoins() == null ? 0 : basicInfo.getPoins();
// int memCredit = basicInfo.getCredit() == null ? 0 : basicInfo.getCredit();
// user.setCredit(memCredit + credit);
// user.setScore(memScore + score);
// }
}
wxCUserService.saveOrUpdate(user);



+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java View File

@@ -74,6 +74,9 @@ public class WxCUserBasicInfo extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate")
private Date createDate;

@io.swagger.annotations.ApiModelProperty(value="登录次数",name="loginCount")
private Integer loginCount;

@Excel(name="成长值",width = 20, orderNum = "11")
@io.swagger.annotations.ApiModelProperty(value="成长值",name="poins")
private Integer poins;


+ 2
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java View File

@@ -254,7 +254,6 @@ public class WxCUserServiceImpl implements WxCUserService {
} catch (Exception e) {
logger.error("c_user 积分 " + e.getMessage());
}
wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_LOGIN, user);

// 用户登陆后 更新最后一次活跃时间
if (user.getUserId() != null) {
@@ -263,6 +262,7 @@ public class WxCUserServiceImpl implements WxCUserService {
WxCUserBasicInfo basicInfo = new WxCUserBasicInfo();
basicInfo.setId(user.getId());
basicInfo.setActiveTime(new Date());
basicInfo.setLoginCount(wxCUserBasicInfo.getLoginCount()+1);
wxCUserBasicInfoService.update(basicInfo);
}
WxCUser wxCUser = getById(user.getId());
@@ -272,6 +272,7 @@ public class WxCUserServiceImpl implements WxCUserService {
cUser.setActiveTime(new Date());
saveOrUpdate(cUser);
}
wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_LOGIN, wxCUserBasicInfo);
}
// 用户从unionId来的,可能会有重复
if(findByUnionId != null) {


+ 3
- 1
mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml View File

@@ -21,6 +21,7 @@
<result column="nick_name" jdbcType="VARCHAR" property="nickName"/>
<result column="credit" jdbcType="INTEGER" property="credit"/>
<result column="active_time" jdbcType="TIMESTAMP" property="activeTime"/>
<result column="login_count" jdbcType="INTEGER" property="loginCount"/>
<result column="act_record" jdbcType="INTEGER" property="actRecord"/>
<result column="score_date" jdbcType="TIMESTAMP" property="scoreDate"/>
<result column="status" jdbcType="INTEGER" property="status"/>
@@ -29,7 +30,8 @@

<sql id="allColumns">
`id`,`phone`,`birthdate`,`education`,`sex`,`email`,`address`,`poins`,`tag_id`,
`create_date`,`update_date`,`tenant_id`,`parent_tenant_id`,`final_tenant_id`,`name`,`nick_name`,`credit`,`active_time`,`act_record`
`create_date`,`update_date`,`tenant_id`,`parent_tenant_id`,`final_tenant_id`,`name`,`nick_name`,
`credit`,`active_time`,`login_count`,`act_record`
,(select level from wx_level_config
where poins >= points and tenant_id=wcubi.tenant_id
order by points desc limit 1 ) level,status


Loading…
Cancel
Save