luminghui
/
sdny-order
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release' into release

Browse Source
release
zhenghaiyang@ele-cloud.com 2 years ago
parent df15763b14 ed4e08d277
commit bae2a03b24
2 changed files with 22 additions and 19 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 23
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java
  2. 18
      order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceRestApiV6.java

23
order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java
Unescape View File

@ -442,6 +442,7 @@ public class UserInfoServiceImpl implements UserInfoService {
public DeptEntity querySysDeptEntity(DeptEntity deptEntity) {
List<String> groupIdList = Lists.newArrayList();
groupIdList.add(deptEntity.getDeptId());
DeptEntity deptEntityNew = null;
List<GroupManagementEntity> entityList = groupManagementService.queryByGroupIdList(groupIdList);
if (entityList != null && entityList.size() > 0) {
//选出默认项
@ -449,18 +450,20 @@ public class UserInfoServiceImpl implements UserInfoService {
.filter(groupManagementEntity -> OrderInfoEnum.ORDER_KPZZGL_SFMRX_0.getKey().equals(groupManagementEntity.getDefaultItem()))
.findFirst();
GroupManagementEntity groupManagementEntity = groupManagementEntityOptional.orElseGet(() -> entityList.get(0));
deptEntity.setTaxpayerCode(groupManagementEntity.getXhfNsrsbh());
deptEntityNew = new DeptEntity();
deptEntityNew.setDeptId(deptEntity.getDeptId());
deptEntityNew.setTaxpayerCode(groupManagementEntity.getXhfNsrsbh());
//todo 虚拟组织：组织名称和销方名称公用此字段会有问题，后期优化
deptEntity.setName(groupManagementEntity.getGroupName());
deptEntity.setTaxpayerName(groupManagementEntity.getXhfMc());
deptEntity.setTaxpayerAddress(groupManagementEntity.getXhfDz());
deptEntity.setTaxpayerPhone(groupManagementEntity.getXhfDh());
deptEntity.setTaxpayerBank(groupManagementEntity.getXhfYh());
deptEntity.setTaxpayerAccount(groupManagementEntity.getXhfZh());
deptEntity.setInvoiceName(groupManagementEntity.getXhfMc());
deptEntity.setInvoiceNsrsbh(groupManagementEntity.getXhfNsrsbh());
deptEntityNew.setName(groupManagementEntity.getGroupName());
deptEntityNew.setTaxpayerName(groupManagementEntity.getXhfMc());
deptEntityNew.setTaxpayerAddress(groupManagementEntity.getXhfDz());
deptEntityNew.setTaxpayerPhone(groupManagementEntity.getXhfDh());
deptEntityNew.setTaxpayerBank(groupManagementEntity.getXhfYh());
deptEntityNew.setTaxpayerAccount(groupManagementEntity.getXhfZh());
deptEntityNew.setInvoiceName(groupManagementEntity.getXhfMc());
deptEntityNew.setInvoiceNsrsbh(groupManagementEntity.getXhfNsrsbh());
}
return deptEntity;
return deptEntityNew;
}

18
order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/api/InvoiceRestApiV6.java
Unescape View File

@ -222,7 +222,10 @@ public class InvoiceRestApiV6 {
PoCommonRequestParam poCommonRequestParam = JsonUtils.getInstance().parseObject(reqStr, PoCommonRequestParam.class);
Map zData = JsonUtils.getInstance().parseObject(poCommonRequestParam.getIS_INPUT().getZDATA(), Map.class);
DeptEntity deptEntity = userInfoService.querySysDeptEntityByEnterpriseNumbers(zData.get("BUKRS").toString());
if(ObjectUtil.isNull(deptEntity)){
if(deptEntity != null){
deptEntity = userInfoService.querySysDeptEntity(deptEntity);
}
if(deptEntity == null){
PoCommonResponseParam poCommonResponseParam = new PoCommonResponseParam();
EsOutput esOutput = new EsOutput();
esOutput.setBSKEY(poCommonRequestParam.getIS_INPUT().getBSKEY());
@ -231,15 +234,12 @@ public class InvoiceRestApiV6 {
esOutput.setZMESSAGE("根据公司代码未查询到对应销方");
poCommonResponseParam.setES_OUTPUT(esOutput);
return JsonUtils.getInstance().toJsonString(poCommonResponseParam);
}else {
if(StringUtils.isBlank(deptEntity.getInvoiceNsrsbh()) && StringUtils.isNotBlank(deptEntity.getDeptId())){
deptEntity = userInfoService.querySysDeptEntity(deptEntity);
}
DdpcxxReqBO ddpcxxReq = BeanTransitionUtils.transitionPoKpReq(poCommonRequestParam,deptEntity);
DdpcxxRspV5 ddpcxxRspV5 = interfaceServiceV6.generateQdInvoiceV6(ddpcxxReq, secretId, null);
PoCommonResponseParam poCommonResponseParam = BeanTransitionUtils.transitionPoKpResp(ddpcxxRspV5);
returnJsonString = JsonUtils.getInstance().toJsonString(poCommonResponseParam);
}
DdpcxxReqBO ddpcxxReq = BeanTransitionUtils.transitionPoKpReq(poCommonRequestParam,deptEntity);
DdpcxxRspV5 ddpcxxRspV5 = interfaceServiceV6.generateQdInvoiceV6(ddpcxxReq, secretId, null);
PoCommonResponseParam poCommonResponseParam = BeanTransitionUtils.transitionPoKpResp(ddpcxxRspV5);
returnJsonString = JsonUtils.getInstance().toJsonString(poCommonResponseParam);
} else if (ConfigurerInfo.GETORDERINFOANDINVOICEINFO.equals(interfaceName)){
//订单和发票数据查询接口
DdfpcxReqV5 ddfpcxReq = JsonUtils.getInstance().parseObject(reqStr, DdfpcxReqV5.class);

Write Preview
Loading…
Cancel
Save