| @@ -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; | |||||
| @@ -83,7 +83,7 @@ public class UserThirdCircleOrderController extends BaseController { | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"shopNumber为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"shopNumber为空"); | ||||
| } | } | ||||
| if(StringUtils.isBlank(userNumber) && StringUtils.isBlank(userPhone)){ | if(StringUtils.isBlank(userNumber) && StringUtils.isBlank(userPhone)){ | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"userNumber或userPhone为空"); | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"userNumber为空且userPhone为空"); | |||||
| } | } | ||||
| if(StringUtils.isNotBlank(userPhone)){ | if(StringUtils.isNotBlank(userPhone)){ | ||||
| if(!userPhone.matches("^1[0-9]{10}$")){ | if(!userPhone.matches("^1[0-9]{10}$")){ | ||||
| @@ -145,7 +145,7 @@ public class UserThirdCircleOrderController extends BaseController { | |||||
| userId = Long.parseLong(userNumber); | userId = Long.parseLong(userNumber); | ||||
| } catch (NumberFormatException e) {} | } catch (NumberFormatException e) {} | ||||
| wxBusinessCircleOrder.setCUserId(userId); | wxBusinessCircleOrder.setCUserId(userId); | ||||
| // wxBusinessCircleOrder.setCUserPhone(userPhone); | |||||
| wxBusinessCircleOrder.setCUserPhone(userPhone); | |||||
| wxBusinessCircleOrder.setAppid("来自第三方数据"); | wxBusinessCircleOrder.setAppid("来自第三方数据"); | ||||
| wxBusinessCircleOrder.setOpenid("来自第三方数据"); | wxBusinessCircleOrder.setOpenid("来自第三方数据"); | ||||
| wxBusinessCircleOrder.setTimeEnd(timeEndDate); | wxBusinessCircleOrder.setTimeEnd(timeEndDate); | ||||
| @@ -172,6 +172,7 @@ public class UserThirdCircleOrderController extends BaseController { | |||||
| userId = Long.parseLong(userNumber); | userId = Long.parseLong(userNumber); | ||||
| } catch (NumberFormatException e) {} | } catch (NumberFormatException e) {} | ||||
| aliBusinessCircleOrder.setCUserId(userId); | aliBusinessCircleOrder.setCUserId(userId); | ||||
| aliBusinessCircleOrder.setCUserPhone(userPhone); | |||||
| aliBusinessCircleOrder.setMallStoreId(shopNumber); | aliBusinessCircleOrder.setMallStoreId(shopNumber); | ||||
| @@ -346,8 +347,8 @@ public class UserThirdCircleOrderController extends BaseController { | |||||
| if(StringUtils.isBlank(shopNumber)){ | if(StringUtils.isBlank(shopNumber)){ | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"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(StringUtils.isNotBlank(userPhone)){ | ||||
| if(!userPhone.matches("^1[0-9]{10}$")){ | if(!userPhone.matches("^1[0-9]{10}$")){ | ||||
| @@ -478,8 +479,8 @@ public class UserThirdCircleOrderController extends BaseController { | |||||
| if(StringUtils.isBlank(transactionId)){ | if(StringUtils.isBlank(transactionId)){ | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL,"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(StringUtils.isNotBlank(userPhone)){ | ||||
| if(!userPhone.matches("^1[0-9]{10}$")){ | if(!userPhone.matches("^1[0-9]{10}$")){ | ||||
| @@ -148,6 +148,13 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder | |||||
| record.setCUserId(null); | 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{ | }else{ | ||||
| AliPayCUser userQ = new AliPayCUser(); | AliPayCUser userQ = new AliPayCUser(); | ||||
| userQ.updateTenantInfo(record); | userQ.updateTenantInfo(record); | ||||
| @@ -155,7 +155,13 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe | |||||
| } | } | ||||
| } | } | ||||
| if(record.getCUserId() == null){ | 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{ | }else{ | ||||
| WxCUserBasicInfo byId = wxCUserBasicInfoService.getById(record.getCUserId(), record.getFinalTenantId()); | WxCUserBasicInfo byId = wxCUserBasicInfoService.getById(record.getCUserId(), record.getFinalTenantId()); | ||||
| if(byId != null){ | if(byId != null){ | ||||
| @@ -376,6 +376,9 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService | |||||
| if(userId != null){ | if(userId != null){ | ||||
| basicInfo = wxCUserBasicInfoService.getById(userId, record.getFinalTenantId()); | basicInfo = wxCUserBasicInfoService.getById(userId, record.getFinalTenantId()); | ||||
| } | } | ||||
| if(basicInfo == null){ | |||||
| basicInfo = wxCUserBasicInfoService.registerByPhone(record, record.getUserPhone(),null,null,null); | |||||
| } | |||||
| if(basicInfo == null){ | if(basicInfo == null){ | ||||
| logger.error("--第三方积分订单--未找到用户---userId="+record.getUserNumber()); | logger.error("--第三方积分订单--未找到用户---userId="+record.getUserNumber()); | ||||
| throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "未找到用户"); | throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "未找到用户"); | ||||
| @@ -558,6 +561,9 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService | |||||
| if(userId != null){ | if(userId != null){ | ||||
| basicInfo = wxCUserBasicInfoService.getById(userId, record.getFinalTenantId()); | basicInfo = wxCUserBasicInfoService.getById(userId, record.getFinalTenantId()); | ||||
| } | } | ||||
| if(basicInfo == null){ | |||||
| basicInfo = wxCUserBasicInfoService.registerByPhone(record, record.getUserPhone(),null,null,null); | |||||
| } | |||||
| if(basicInfo == null){ | if(basicInfo == null){ | ||||
| logger.error("--第三方积分变动--未找到用户---userId="+record.getUserNumber()); | logger.error("--第三方积分变动--未找到用户---userId="+record.getUserNumber()); | ||||
| throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "未找到用户"); | throw new MallinkException(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "未找到用户"); | ||||