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

feature 1.赋值成品油数据

Browse Source
release
zhenghaiyang@ele-cloud.com 2 years ago
parent 09b820461f
commit 7fc0b8db65
3 changed files with 29 additions and 5 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. 3
      order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/CommonInterfaceService.java
  2. 10
      order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java
  3. 19
      order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java

3
order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/CommonInterfaceService.java
Unescape View File

@ -11,6 +11,7 @@ import com.dxhy.order.consumer.openapi.protocol.v5.DxhyInterfaceRequest;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
/**
* @Description: 订单对外接口业务层接口
@ -117,7 +118,7 @@ public interface CommonInterfaceService {
void dealOrderItem(List<OrderItemInfo> orderItemInfo, String xhfNsrsbh, String qdbz, String fpzldm,
String terminal, String idType) throws OrderReceiveException;
void dealOrderItem(List<OrderItemInfo> orderItemInfo, String xhfNsrsbh, String qdbz, String fpzldm,
Map<String,String> dealOrderItem(List<OrderItemInfo> orderItemInfo, String xhfNsrsbh, String qdbz, String fpzldm,
String terminal, String idType, String entId) throws OrderReceiveException;
/**

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

@ -131,7 +131,6 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt
private GroupManagementService groupManagementService;
@Resource
private InvoiceRemarkSetService invoiceRemarkSetService;
/**
* 发票开具接口
*
@ -1161,8 +1160,15 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt
//commonInterfaceService.dealOrderInfoKpr(commonOrderInfo.getOrderInfo(), null);
//补全商品信息
commonInterfaceService.dealOrderItem(commonOrderInfo.getOrderItemInfo(), nsrsbh, commonOrderInfo.getOrderInfo().getQdBz(),
Map<String, String> map = commonInterfaceService.dealOrderItem(commonOrderInfo.getOrderItemInfo(), nsrsbh, commonOrderInfo.getOrderInfo().getQdBz(),
commonOrderInfo.getOrderInfo().getFpzlDm(), terminalCode, ConfigureConstant.STRING_1, commonOrderInfo.getOrderInfo().getEntId());
if(map != null){
String cpy = map.get("cpy");
if(cpy != null && StringUtils.isNotBlank(cpy)){
orderBatchRequest.setSfcpy(ConfigureConstant.STRING_1);
commonOrderInfo.getOrderInfo().setQdBz(OrderInfoEnum.QDBZ_CODE_4.getKey());
}
}
}
public PageKpzzglRsp queryKpzzgl(PageKpzzglReq pageKpzzglReq) {

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

@ -37,6 +37,8 @@ import com.dxhy.order.model.qd.OrderInfoQd;
import com.dxhy.order.model.qd.QdFjys;
import com.dxhy.order.model.sk.sld.SearchSld;
import com.dxhy.order.utils.*;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@ -508,13 +510,16 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService {
}
@Override
public void dealOrderItem(List<OrderItemInfo> orderItemInfo, String xhfNsrsbh, String qdbz, String fpzldm,
public Map<String,String> dealOrderItem(List<OrderItemInfo> orderItemInfo, String xhfNsrsbh, String qdbz, String fpzldm,
String terminal, String idType, String entId) throws OrderReceiveException {
long start = System.currentTimeMillis();
Map<String, String> hashMap = Maps.newHashMap();
List<String> shList = new ArrayList<>();
shList.add(xhfNsrsbh);
StringBuilder errorStr = new StringBuilder();
List<String> cpyList = Lists.newArrayList();
for (int i = 0; i < orderItemInfo.size(); i++) {
String cpy = "N";
String pply = "公司库匹配";
OrderItemInfo item = orderItemInfo.get(i);
//rowIndex excel导入时为行坐标，其他业务时为明细行在集合中的索引值
@ -541,6 +546,7 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService {
if (ConfigureConstant.STRING_0000.equals(r.get(OrderManagementConstant.CODE))) {
CommodityCodeEntity commodityCodeEntity = (CommodityCodeEntity) r.get(OrderManagementConstant.DATA);
completeCommodityMessageBySpid(item, commodityCodeEntity);
cpy = commodityCodeEntity.getCpy();
} else {
log.error("{}根据商品id查询商品信息异常：{}", LOGGER_MSG, r.get(OrderManagementConstant.MESSAGE));
errorStr.append(indexStr)
@ -605,6 +611,7 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService {
spmc = stringBuilder.append("*").append(taxClassCodeEntity.getSpjc()).append("*").append(spmc).toString();
}
item.setXmmc(spmc);
cpy = taxClassCodeEntity.getCpy();
}else {
log.debug("{}项目名称:{},智能赋码未匹配到税编",LOGGER_MSG,item.getXmmc());
/*errorStr.append(indexStr)
@ -634,6 +641,7 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService {
// 判断是否推送了物料的名称、单位、规格型号信息
//如果项目名称为空,使用底层返回数据进行补全,如果不为空,并且需要补全,则进行补全
completeCommodityMessageBySpid(item,commodityCodeEntity);
cpy = commodityCodeEntity.getCpy();
}
} else if (StringUtils.isBlank(item.getSpbm())) {
@ -673,6 +681,7 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService {
CommodityCodeEntity commodityCodeEntity = queryProductList.get(0);
completeCommodityMessageByXmmc(item, commodityCodeEntity);
cpy = commodityCodeEntity.getCpy();
} else {
//商品编码不为空,需要调用底层商品编码获取简码接口获取数据
String spbm = item.getSpbm();
@ -697,6 +706,7 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService {
}
}
log.debug("{}物料:{},匹配类型:{}",LOGGER_MSG,item.getZxbm(),pply);
cpyList.add(cpy);
}
if (StringUtils.isNotBlank(errorStr.toString())) {
log.error("{}补全商品信息出现错误:{}", LOGGER_MSG, errorStr);
@ -704,6 +714,13 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService {
}
long end = System.currentTimeMillis();
log.debug("{}订单明细信息补全耗时:{}", LOGGER_MSG, end - start);
if(cpyList.size() == orderItemInfo.size()){
boolean allMatch = cpyList.stream().allMatch(cpy -> cpy.equals("Y"));
if(allMatch){
hashMap.put("cpy",OrderInfoEnum.QDBZ_CODE_4.getKey());
}
}
return hashMap;
}
/**

Write Preview
Loading…
Cancel
Save