This commit is contained in:
苏竹红
2025-04-14 15:26:19 +08:00
parent b5ee71b4c1
commit 20e0bab663
2 changed files with 16 additions and 25 deletions

View File

@@ -126,12 +126,8 @@ public class PushServiceImpl implements PushService {
@Override
public Boolean modifyDownstreamSystem(ModifyPasswordDTO modifyPasswordDTO) {
try {
this.modifyPosPassword(modifyPasswordDTO);
//this.modifyXGJPassword(modifyPasswordDTO);
} catch (Exception e) {
throw new ServiceException(ErrorCodeEnum.THIRD_API_ERROR);
}
this.modifyPosPassword(modifyPasswordDTO);
//this.modifyXGJPassword(modifyPasswordDTO);
return Boolean.TRUE;
}
@@ -211,7 +207,6 @@ public class PushServiceImpl implements PushService {
throw new ServiceException(ErrorCodeEnum.THIRD_API_ERROR,
"业务逻辑错误: " + apiResponse.getMsg());
}
return apiResponse.getData();
}
} catch (ServiceException e) {

View File

@@ -202,24 +202,20 @@ public class ShopAccountServiceImpl implements ShopAccountService {
downSystemTypeEnum = DownSystemTypeEnum.POS;
}
ZxjpApiRequest data = this.getData(accountAuditDTO.getShopId(), downSystemTypeEnum);
try {
if (DownSystemTypeEnum.POS.equals(downSystemTypeEnum)){
Boolean successFlag = pushService.pushDataToPOS(data);
OpenStatusEnum openStatusEnum = successFlag ? OpenStatusEnum.OPENSTATUSENUM_5 : OpenStatusEnum.OPENSTATUSENUM_6;
shopAccountDAO.updateStatusByShopIdAndSystemName(accountAuditDTO.getShopId(),Arrays.asList(ShopAccountEnum.HUOMA.getSystemName()),openStatusEnum.getCode(),new Date());
//阶段完成
PostAndOrderRequest postAndOrderRequest = new PostAndOrderRequest();
postAndOrderRequest.setShopId(accountAuditDTO.getShopId());
postAndOrderRequest.setType(PosAndOrderEnum.POS.getCode());
postAndOrderRequest.setRemark("您好,您的账号已经建立,后续由运营经理服务,请您联系您督导或者经理添加我们运营经理微信,感谢您的配合!");
postAndOrderRequest.setAccount(data.getPartnerMobile());
postAndOrderRequest.setPassword(data.getDownstreamSystemPassword());
posAndOrderInfoService.submitOrUpdate(postAndOrderRequest,null);
}else {
pushService.pushDataToXGJ(data);
}
} catch (Exception e) {
throw new ServiceException(ErrorCodeEnum.THIRD_API_ERROR, "接口调用异常: " + e.getMessage());
if (DownSystemTypeEnum.POS.equals(downSystemTypeEnum)){
Boolean successFlag = pushService.pushDataToPOS(data);
OpenStatusEnum openStatusEnum = successFlag ? OpenStatusEnum.OPENSTATUSENUM_5 : OpenStatusEnum.OPENSTATUSENUM_6;
shopAccountDAO.updateStatusByShopIdAndSystemName(accountAuditDTO.getShopId(),Arrays.asList(ShopAccountEnum.HUOMA.getSystemName()),openStatusEnum.getCode(),new Date());
//阶段完成
PostAndOrderRequest postAndOrderRequest = new PostAndOrderRequest();
postAndOrderRequest.setShopId(accountAuditDTO.getShopId());
postAndOrderRequest.setType(PosAndOrderEnum.POS.getCode());
postAndOrderRequest.setRemark("您好,您的账号已经建立,后续由运营经理服务,请您联系您督导或者经理添加我们运营经理微信,感谢您的配合!");
postAndOrderRequest.setAccount(data.getPartnerMobile());
postAndOrderRequest.setPassword(data.getDownstreamSystemPassword());
posAndOrderInfoService.submitOrUpdate(postAndOrderRequest,null);
}else {
pushService.pushDataToXGJ(data);
}
return Boolean.TRUE;
}