Browse Source

//third

release_toaliyun_real
xhxu 3 years ago
parent
commit
a9afac2bfd
5 changed files with 32 additions and 7 deletions
  1. +5
    -0
      mallinkAdmin/src/main/resources/db/migration/V2022092000001__add_ttjifen.sql
  2. +7
    -6
      mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java
  3. +7
    -0
      mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java
  4. +7
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java
  5. +6
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java

+ 5
- 0
mallinkAdmin/src/main/resources/db/migration/V2022092000001__add_ttjifen.sql View File

@@ -0,0 +1,5 @@
INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (5310, '抖音商城管理', 508, 'Y', NULL, 1, NULL, NULL, 'dy_jifensc', NULL, 0, 531);
INSERT INTO `mallink`.`mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (5320, '抖音积分券', 508, 'Y', NULL, 1, NULL, NULL, 'dy_jifenq', NULL, 0, 532);


UPDATE `mallink`.`mall_sale_type` SET `menus` = '[1, 2, 4, 5, 6, 50, 105, 110, 201, 205, 202, 211, 212, 221, 222, 223, 251, 409, 410, 411, 416, 500, 502, 504, 505, 506, 507, 508, 511, 512, 521, 522, 523, 591, 592, 595, 601, 602, 605, 606, 610, 622, 647, 676, 680, 711, 901, 902, 904, 907, 5310, 5320]' WHERE `id` = 11;

+ 7
- 6
mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java View File

@@ -83,7 +83,7 @@ public class UserThirdCircleOrderController extends BaseController {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"shopNumber为空");
}
if(StringUtils.isBlank(userNumber) && StringUtils.isBlank(userPhone)){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"userNumberuserPhone为空");
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"userNumber为空且userPhone为空");
}
if(StringUtils.isNotBlank(userPhone)){
if(!userPhone.matches("^1[0-9]{10}$")){
@@ -145,7 +145,7 @@ public class UserThirdCircleOrderController extends BaseController {
userId = Long.parseLong(userNumber);
} catch (NumberFormatException e) {}
wxBusinessCircleOrder.setCUserId(userId);
// wxBusinessCircleOrder.setCUserPhone(userPhone);
wxBusinessCircleOrder.setCUserPhone(userPhone);
wxBusinessCircleOrder.setAppid("来自第三方数据");
wxBusinessCircleOrder.setOpenid("来自第三方数据");
wxBusinessCircleOrder.setTimeEnd(timeEndDate);
@@ -172,6 +172,7 @@ public class UserThirdCircleOrderController extends BaseController {
userId = Long.parseLong(userNumber);
} catch (NumberFormatException e) {}
aliBusinessCircleOrder.setCUserId(userId);
aliBusinessCircleOrder.setCUserPhone(userPhone);

aliBusinessCircleOrder.setMallStoreId(shopNumber);

@@ -346,8 +347,8 @@ public class UserThirdCircleOrderController extends BaseController {
if(StringUtils.isBlank(shopNumber)){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"shopNumber为空");
}
if(StringUtils.isBlank(userNumber)){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"userNumber为空");
if(StringUtils.isBlank(userNumber) && StringUtils.isBlank(userPhone)){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"userNumber为空且userPhone为空");
}
if(StringUtils.isNotBlank(userPhone)){
if(!userPhone.matches("^1[0-9]{10}$")){
@@ -478,8 +479,8 @@ public class UserThirdCircleOrderController extends BaseController {
if(StringUtils.isBlank(transactionId)){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"transactionId为空");
}
if(StringUtils.isBlank(userNumber)){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"userNumber为空");
if(StringUtils.isBlank(userNumber) && StringUtils.isBlank(userPhone)){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"userNumber为空且userPhone为空");
}
if(StringUtils.isNotBlank(userPhone)){
if(!userPhone.matches("^1[0-9]{10}$")){


+ 7
- 0
mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java View File

@@ -148,6 +148,13 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder
record.setCUserId(null);
}

}else if(record.getCUserPhone() != null) {
WxCUserBasicInfo byPhone = wxCUserBasicInfoService.registerByPhone(record, record.getCUserPhone(), null, null, null);
if (byPhone != null) {
record.setCUserId(byPhone.getId());
record.setCUserNickName(byPhone.getNickName());
record.setCUserPhone(byPhone.getPhone());
}
}else{
AliPayCUser userQ = new AliPayCUser();
userQ.updateTenantInfo(record);


+ 7
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java View File

@@ -155,7 +155,13 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe
}
}
if(record.getCUserId() == null){
logger.error("--微信商圈付款通知消息未找到会员--1");
WxCUserBasicInfo byPhone = wxCUserBasicInfoService.registerByPhone(record, record.getCUserPhone(),null,null,null);
if(byPhone != null){
record.setCUserNickName(byPhone.getNickName());
record.setCUserPhone(byPhone.getPhone());
}else{
logger.error("--微信商圈付款通知消息未找到会员--1");
}
}else{
WxCUserBasicInfo byId = wxCUserBasicInfoService.getById(record.getCUserId(), record.getFinalTenantId());
if(byId != null){


+ 6
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java View File

@@ -376,6 +376,9 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService
if(userId != null){
basicInfo = wxCUserBasicInfoService.getById(userId, record.getFinalTenantId());
}
if(basicInfo == null){
basicInfo = wxCUserBasicInfoService.registerByPhone(record, record.getUserPhone(),null,null,null);
}
if(basicInfo == null){
logger.error("--第三方积分订单--未找到用户---userId="+record.getUserNumber());
throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "未找到用户");
@@ -558,6 +561,9 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService
if(userId != null){
basicInfo = wxCUserBasicInfoService.getById(userId, record.getFinalTenantId());
}
if(basicInfo == null){
basicInfo = wxCUserBasicInfoService.registerByPhone(record, record.getUserPhone(),null,null,null);
}
if(basicInfo == null){
logger.error("--第三方积分变动--未找到用户---userId="+record.getUserNumber());
throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "未找到用户");


Loading…
Cancel
Save