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 43d57bebed f5c41e7bd9
commit 19a2b00d47
6 changed files with 51 additions and 47 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. 5
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderSplitController.java
  2. 5
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderSplitServiceImpl.java
  3. 4
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/validate/service/impl/ValidateInterfaceOrderServiceImpl.java
  4. 6
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/validate/service/impl/ValidateOrderInfoServiceImpl.java
  5. 76
      order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java
  6. 2
      order-management-consumer/src/main/resources/bootstrap-std.yaml

5
order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderSplitController.java
Unescape View File

@ -89,7 +89,7 @@ public class OrderSplitController {
return R.ok().put(OrderManagementConstant.CODE, e.getCode()).put(OrderManagementConstant.MESSAGE, e.getMessage()); return R.ok().put(OrderManagementConstant.CODE, e.getCode()).put(OrderManagementConstant.MESSAGE, e.getMessage());
} catch (Exception e) { } catch (Exception e) {
log.error("{}订单拆分接口异常，异常信息:{}", LOGGER_MSG, e); log.error("{}订单拆分接口异常，异常信息:{}", LOGGER_MSG, e);
return R.error(); return R.error(e.getMessage());
} }
} }
@ -248,7 +248,6 @@ public class OrderSplitController {
@SysLog(operation = "保存拆分订单rest接口", operationDesc = "对订单进行拆分后数据保存", key = "订单拆分") @SysLog(operation = "保存拆分订单rest接口", operationDesc = "对订单进行拆分后数据保存", key = "订单拆分")
public R saveOrderInfo( public R saveOrderInfo(
@ApiParam(name = "orderInfo", value = "拆分订单的全信息") @RequestBody List<CommonOrderInfo> commonList) { @ApiParam(name = "orderInfo", value = "拆分订单的全信息") @RequestBody List<CommonOrderInfo> commonList) {
log.info("{}页面订单信息录入的接口，commonOrder:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(commonList));
try { try {
log.info("{}页面订单信息录入的接口，前端传入的参数commonList:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(commonList)); log.info("{}页面订单信息录入的接口，前端传入的参数commonList:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(commonList));
orderSplitService.splitOrder(commonList); orderSplitService.splitOrder(commonList);
@ -259,7 +258,7 @@ public class OrderSplitController {
return R.error().put(OrderManagementConstant.CODE, e.getCode()).put(OrderManagementConstant.MESSAGE, e.getMessage()); return R.error().put(OrderManagementConstant.CODE, e.getCode()).put(OrderManagementConstant.MESSAGE, e.getMessage());
} catch (Exception e) { } catch (Exception e) {
return R.error().put(OrderManagementConstant.CODE, OrderInfoContentEnum.RECEIVE_FAILD.getKey()) return R.error().put(OrderManagementConstant.CODE, OrderInfoContentEnum.RECEIVE_FAILD.getKey())
.put(OrderManagementConstant.MESSAGE, OrderInfoContentEnum.RECEIVE_FAILD.getMessage()); .put(OrderManagementConstant.MESSAGE, e.getMessage());
} }
} }

5
order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderSplitServiceImpl.java
Unescape View File

@ -329,10 +329,7 @@ public class OrderSplitServiceImpl implements OrderSplitService {
continue; continue;
} }
//购方是否为空、税编是否为空校验、成品油校验 //税编是否为空校验、成品油校验
if(StrUtil.isBlank(commonOrderInfo.getOrderInfo().getGhfNsrsbh()) || StrUtil.isBlank(commonOrderInfo.getOrderInfo().getGhfMc()) ){
throw new Exception("购方信息为空,请补全!");
}
String cpy = ""; String cpy = "";
for(OrderItemInfo orderItemInfo: commonOrderInfo.getOrderItemInfo()){ for(OrderItemInfo orderItemInfo: commonOrderInfo.getOrderItemInfo()){
if(StrUtil.isBlank(orderItemInfo.getSpbm())){ if(StrUtil.isBlank(orderItemInfo.getSpbm())){

4
order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/validate/service/impl/ValidateInterfaceOrderServiceImpl.java
Unescape View File

@ -3599,7 +3599,7 @@ public class ValidateInterfaceOrderServiceImpl implements ValidateInterfaceOrder
} }
if(StringUtils.isBlank(orderItemInfo.getYhzcbs())){ if(StringUtils.isBlank(orderItemInfo.getYhzcbs())){
if(StringUtils.isBlank(orderItemInfo.getSpId())){ if(StringUtils.isBlank(orderItemInfo.getSpId())){
resultMapList.add(CheckParamUtil.generateErrorMap(null, errorMsg, OrderInfoContentEnum.CHECK_ISS7PRI_107186)); //resultMapList.add(CheckParamUtil.generateErrorMap(null, errorMsg, OrderInfoContentEnum.CHECK_ISS7PRI_107186));
} }
}else { }else {
//优惠政策标识只能为0或1,0:不使用,1:使用 //优惠政策标识只能为0或1,0:不使用,1:使用
@ -3683,7 +3683,7 @@ public class ValidateInterfaceOrderServiceImpl implements ValidateInterfaceOrder
resultMapList.add(checkResultMap); resultMapList.add(checkResultMap);
} }
if(StringUtils.isBlank(orderItemInfo.getXmmc()) && StringUtils.isBlank(orderItemInfo.getSpId())){ if(StringUtils.isBlank(orderItemInfo.getXmmc()) && StringUtils.isBlank(orderItemInfo.getSpId())){
resultMapList.add(CheckParamUtil.generateErrorMap(null, errorMsg, OrderInfoContentEnum.CHECK_ISS7PRI_107187)); //resultMapList.add(CheckParamUtil.generateErrorMap(null, errorMsg, OrderInfoContentEnum.CHECK_ISS7PRI_107187));
} }
/* /*

6
order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/validate/service/impl/ValidateOrderInfoServiceImpl.java
Unescape View File

@ -300,13 +300,13 @@ public class ValidateOrderInfoServiceImpl implements ValidateOrderInfoService {
} }
} }
//放到生成预制发票时校验
if (!isCpySpbm.equals(taxClassCodeEntity.getCpy())) { /*if (!isCpySpbm.equals(taxClassCodeEntity.getCpy())) {
//成品油商品编码和非成品油商品编码混开 //成品油商品编码和非成品油商品编码混开
log.error("{}发票只能为成品油或者非成品油", LOGGER_MSG); log.error("{}发票只能为成品油或者非成品油", LOGGER_MSG);
checkResultMap = CheckParamUtil.generateErrorMap(orderInfo.getFpqqlsh(), errorMsgString, OrderInfoContentEnum.ORDER_SPBM_CPY_ERROR); checkResultMap = CheckParamUtil.generateErrorMap(orderInfo.getFpqqlsh(), errorMsgString, OrderInfoContentEnum.ORDER_SPBM_CPY_ERROR);
return checkResultMap; return checkResultMap;
} }*/
} }

76
order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java
Unescape View File

@ -575,45 +575,50 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService {
pply = "智能匹配"; pply = "智能匹配";
// ③　若通过集团物料库仍未匹配到税编信息则，使用“物料名称”进行智能赋码开票（用SAAS接口赋码） // ③　若通过集团物料库仍未匹配到税编信息则，使用“物料名称”进行智能赋码开票（用SAAS接口赋码）
// 智能赋码接口 // 智能赋码接口
Map<String, Object> paramMap = new HashMap<>(); if(StrUtil.isNotBlank(item.getXmmc())){
paramMap.put("parameter", item.getXmmc()); Map<String, Object> paramMap = new HashMap<>();
List<TaxClassCodeEntity> taxClassList = taxClassCodeMapper.selectTaxClassCode(paramMap); paramMap.put("parameter", item.getXmmc());
if (CollectionUtils.isNotEmpty(taxClassList)) { List<TaxClassCodeEntity> taxClassList = taxClassCodeMapper.selectTaxClassCode(paramMap);
TaxClassCodeEntity taxClassCodeEntity = taxClassList.get(0); if (CollectionUtils.isNotEmpty(taxClassList)) {
//商品编码 TaxClassCodeEntity taxClassCodeEntity = taxClassList.get(0);
if (StringUtils.isBlank(item.getSpbm()) && StringUtils.isNotBlank(taxClassCodeEntity.getSpbm())) { //商品编码
item.setSpbm(taxClassCodeEntity.getSpbm()); if (StringUtils.isBlank(item.getSpbm()) && StringUtils.isNotBlank(taxClassCodeEntity.getSpbm())) {
} item.setSpbm(taxClassCodeEntity.getSpbm());
}
//优惠政策标识
if (StringUtils.isBlank(item.getYhzcbs())) { //优惠政策标识
item.setYhzcbs(ConfigureConstant.STRING_0); if (StringUtils.isBlank(item.getYhzcbs())) {
} item.setYhzcbs(ConfigureConstant.STRING_0);
//零税率标识 }
if (StringUtils.isBlank(item.getLslbs())) { //零税率标识
item.setLslbs(""); if (StringUtils.isBlank(item.getLslbs())) {
} item.setLslbs("");
//增值税特殊管理 }
if (StringUtils.isBlank(item.getZzstsgl())) { //增值税特殊管理
item.setZzstsgl(""); if (StringUtils.isBlank(item.getZzstsgl())) {
} item.setZzstsgl("");
}
//如果项目名称为空,使用底层返回数据进行补全,如果不为空,并且需要补全,则进行补全 log.debug("{}项目名称:{},智能赋码成功,匹配到税编:{}",LOGGER_MSG,item.getXmmc(),item.getSpbm());
String spmc = item.getXmmc(); //如果项目名称为空,使用底层返回数据进行补全,如果不为空,并且需要补全,则进行补全
StringBuilder stringBuilder = new StringBuilder(); String spmc = item.getXmmc();
if (StringUtils.isBlank(spmc)) { StringBuilder stringBuilder = new StringBuilder();
spmc = stringBuilder.append("*").append(taxClassCodeEntity.getSpjc()).append("*").append(taxClassCodeEntity.getSpmc()).toString(); if (StringUtils.isBlank(spmc)) {
} else if (StringUtil.checkStr(spmc, taxClassCodeEntity.getSpjc())) { spmc = stringBuilder.append("*").append(taxClassCodeEntity.getSpjc()).append("*").append(taxClassCodeEntity.getSpmc()).toString();
spmc = stringBuilder.append("*").append(taxClassCodeEntity.getSpjc()).append("*").append(spmc).toString(); } else if (StringUtil.checkStr(spmc, taxClassCodeEntity.getSpjc())) {
} spmc = stringBuilder.append("*").append(taxClassCodeEntity.getSpjc()).append("*").append(spmc).toString();
item.setXmmc(spmc); }
}else { item.setXmmc(spmc);
log.error("{}{}",LOGGER_MSG,OrderInfoContentEnum.INVOICE_SPBM_MATCH_NULL.getMessage()); }else {
log.debug("{}项目名称:{},智能赋码未匹配到税编",LOGGER_MSG,item.getXmmc());
/*errorStr.append(indexStr) /*errorStr.append(indexStr)
.append(ConfigureConstant.STRING_UNDERLINE) .append(ConfigureConstant.STRING_UNDERLINE)
.append(OrderInfoContentEnum.INVOICE_SPBM_MATCH_NULL.getMessage()) .append(OrderInfoContentEnum.INVOICE_SPBM_MATCH_NULL.getMessage())
.append("\r\n");*/ .append("\r\n");*/
}
}else{
log.debug("{}项目名称为空,智能赋码失败",LOGGER_MSG);
} }
} }
}else { }else {
item.setZnfm(ConfigureConstant.STRING_0); // 公司库匹配到即非智能赋码；其他情况均为智能赋码 item.setZnfm(ConfigureConstant.STRING_0); // 公司库匹配到即非智能赋码；其他情况均为智能赋码
@ -621,12 +626,13 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService {
// 如果没有找到，记录异常 // 如果没有找到，记录异常
if (commodityCodeEntity == null) { if (commodityCodeEntity == null) {
log.error("{}根据商品名称查询到的商品为空,商品名称：{}", LOGGER_MSG, item.getXmmc()); log.debug("{}根据物料编码在公司库和集团库未匹配到税编", LOGGER_MSG);
/*errorStr.append(indexStr) /*errorStr.append(indexStr)
.append(ConfigureConstant.STRING_UNDERLINE) .append(ConfigureConstant.STRING_UNDERLINE)
.append(OrderInfoContentEnum.INVOICE_SPBM_QUERY_NULL.getMessage()) .append(OrderInfoContentEnum.INVOICE_SPBM_QUERY_NULL.getMessage())
.append("\r\n");*/ .append("\r\n");*/
} else { } else {
log.debug("{}根据物料编码在公司库或集团库匹配到了税编,开始补全明细", LOGGER_MSG);
// 如果找到记录，进行赋值匹配 // 如果找到记录，进行赋值匹配
// 判断是否推送了物料的名称、单位、规格型号信息 // 判断是否推送了物料的名称、单位、规格型号信息
//如果项目名称为空,使用底层返回数据进行补全,如果不为空,并且需要补全,则进行补全 //如果项目名称为空,使用底层返回数据进行补全,如果不为空,并且需要补全,则进行补全

2
order-management-consumer/src/main/resources/bootstrap-std.yaml
Unescape View File

@ -57,6 +57,8 @@ spring:
discovery: discovery:
# Nacos discovery 服务地址 # Nacos discovery 服务地址
server-addr: nacos-1.itax.local:33000 server-addr: nacos-1.itax.local:33000
username: nacos
password: FaP!a0_NacOs
#sentinel配置相关 #sentinel配置相关
sentinel: sentinel:
#sentinel是否开启控制 #sentinel是否开启控制

Write Preview
Loading…
Cancel
Save