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

Merge branch 'release' into test

Browse Source 
# Conflicts:
#	order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java
release
gaorl 2 years ago
parent a90e8564f7 956d66287a
commit 511dd166c5
3 changed files with 53 additions and 50 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. 1
      order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java
  2. 2
      order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml
  3. 100
      order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java

1
order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityServiceImpl.java
Unescape View File

@ -134,6 +134,7 @@ public class CommodityServiceImpl implements CommodityService {
} }
if(StringUtils.isBlank(codeEntity.getYhzcbs())|| "0".equals(codeEntity.getYhzcbs())){ if(StringUtils.isBlank(codeEntity.getYhzcbs())|| "0".equals(codeEntity.getYhzcbs())){
codeEntity.setZzstsgl(""); codeEntity.setZzstsgl("");
codeEntity.setLslbs("");
} }
codeEntity.setXhfNsrsbh(null);//不更新税号 codeEntity.setXhfNsrsbh(null);//不更新税号
codeEntity.setModifyTime(new Date()); codeEntity.setModifyTime(new Date());

2
order-management-base-service/src/main/resources/mybatis/mapper/CommodityMapper.xml
Unescape View File

@ -297,7 +297,7 @@
<if test="commodityCode.ssflMc != null and commodityCode.ssflMc != ''"> <if test="commodityCode.ssflMc != null and commodityCode.ssflMc != ''">
tax_classification_name = #{commodityCode.ssflMc,jdbcType=VARCHAR}, tax_classification_name = #{commodityCode.ssflMc,jdbcType=VARCHAR},
</if> </if>
<if test="commodityCode.lslbs != null and commodityCode.lslbs != ''"> <if test="commodityCode.lslbs != null">
preferential_policies_type = #{commodityCode.lslbs,jdbcType=VARCHAR}, preferential_policies_type = #{commodityCode.lslbs,jdbcType=VARCHAR},
</if> </if>
<if test="commodityCode.zzstsgl != null"> <if test="commodityCode.zzstsgl != null">

100
order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/manager/service/impl/InvoiceServiceImpl.java
Unescape View File

@ -51,6 +51,7 @@ import com.dxhy.order.utils.JsonUtils;
import com.dxhy.order.utils.NsrsbhUtils; import com.dxhy.order.utils.NsrsbhUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -59,7 +60,6 @@ import org.springframework.util.CollectionUtils;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -173,7 +173,6 @@ public class InvoiceServiceImpl implements InvoiceService {
// if(StrUtil.isBlank(commonOrderInfo.getOrderInfo().getGhfNsrsbh()) || StrUtil.isBlank(commonOrderInfo.getOrderInfo().getGhfMc()) ){ // if(StrUtil.isBlank(commonOrderInfo.getOrderInfo().getGhfNsrsbh()) || StrUtil.isBlank(commonOrderInfo.getOrderInfo().getGhfMc()) ){
// return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"购方信息为空,请补全!"); // return R.error("结算单:"+commonOrderInfo.getOrderInfo().getDdh()+"购方信息为空,请补全!");
// } // }
String cpy = "";
String kcp = baseServiceConfig.getKcp(); String kcp = baseServiceConfig.getKcp();
boolean kcpMark; boolean kcpMark;
List<OrderItemInfo> cpyOrderItems = new ArrayList<OrderItemInfo>(); List<OrderItemInfo> cpyOrderItems = new ArrayList<OrderItemInfo>();
@ -301,34 +300,35 @@ public class InvoiceServiceImpl implements InvoiceService {
orderSplit.stream().forEach(splitEn -> { orderSplit.stream().forEach(splitEn -> {
List<OrderItemInfo> orderItemInfo = splitEn.getOrderItemInfo(); List<OrderItemInfo> orderItemInfo = splitEn.getOrderItemInfo();
orderItemInfo.stream().forEach(splitItem -> { orderItemInfo.stream().forEach(splitItem -> {
List<OrderItemInfo> collect = commonOrderInfo.getOrderItemInfo().stream().filter(oi -> oi.getXmmc().equals(splitItem.getXmmc()) && // List<OrderItemInfo> collect = commonOrderInfo.getOrderItemInfo().stream().filter(oi -> oi.getXmmc().equals(splitItem.getXmmc()) &&
((StrUtil.isBlank(oi.getGgxh()) && StrUtil.isBlank(splitItem.getGgxh())) || oi.getGgxh().equals(splitItem.getGgxh())) && // ((StrUtil.isBlank(oi.getGgxh()) && StrUtil.isBlank(splitItem.getGgxh())) || oi.getGgxh().equals(splitItem.getGgxh())) &&
((StrUtil.isBlank(oi.getXmdw()) && StrUtil.isBlank(splitItem.getXmdw())) || oi.getXmdw().equals(splitItem.getXmdw())) && // ((StrUtil.isBlank(oi.getXmdw()) && StrUtil.isBlank(splitItem.getXmdw())) || oi.getXmdw().equals(splitItem.getXmdw())) &&
((StrUtil.isBlank(oi.getSl()) && StrUtil.isBlank(splitItem.getSl())) || oi.getSl().equals(splitItem.getSl()))).collect(Collectors.toList()); // ((StrUtil.isBlank(oi.getSl()) && StrUtil.isBlank(splitItem.getSl())) || oi.getSl().equals(splitItem.getSl()))).collect(Collectors.toList());
if (collect.size() == 1) { // if (collect.size() == 1) {
List<RuleSplitEntity> ruleSplitEntityList = ruleSplitService.queryRuleSplit(commonOrderInfo.getOrderInfo().getXhfNsrsbh(), pageInvoiceReq.getUserId()); // List<RuleSplitEntity> ruleSplitEntityList = ruleSplitService.queryRuleSplit(commonOrderInfo.getOrderInfo().getXhfNsrsbh(), pageInvoiceReq.getUserId());
log.info("税号：{}，用户ID:{},查询的拆分限额信息结果：{}", commonOrderInfo.getOrderInfo().getXhfNsrsbh(), // log.info("税号：{}，用户ID:{},查询的拆分限额信息结果：{}", commonOrderInfo.getOrderInfo().getXhfNsrsbh(),
pageInvoiceReq.getUserId(), JsonUtils.getInstance().toJsonString(ruleSplitEntityList)); // pageInvoiceReq.getUserId(), JsonUtils.getInstance().toJsonString(ruleSplitEntityList));
String djce = ConfigureConstant.STRING_0; // String djce = ConfigureConstant.STRING_0;
if(ruleSplitEntityList.size() != 0){ // if(ruleSplitEntityList.size() != 0){
djce = StrUtil.isBlank(ruleSplitEntityList.get(0).getDjce())?ConfigureConstant.STRING_0:ruleSplitEntityList.get(0).getDjce(); // djce = StrUtil.isBlank(ruleSplitEntityList.get(0).getDjce())?ConfigureConstant.STRING_0:ruleSplitEntityList.get(0).getDjce();
} // }
if(ObjectUtil.isNotNull(collect.get(0).getXmdj()) && StrUtil.isNotBlank(collect.get(0).getXmdj()) && // if(ObjectUtil.isNotNull(collect.get(0).getXmdj()) && StrUtil.isNotBlank(collect.get(0).getXmdj()) &&
ObjectUtil.isNotNull(splitItem.getXmdj()) && StrUtil.isNotBlank(splitItem.getXmdj())){ // ObjectUtil.isNotNull(splitItem.getXmdj()) && StrUtil.isNotBlank(splitItem.getXmdj())){
BigDecimal abs = new BigDecimal(collect.get(0).getXmdj()).subtract(new BigDecimal(splitItem.getXmdj())).abs(); // BigDecimal abs = new BigDecimal(collect.get(0).getXmdj()).subtract(new BigDecimal(splitItem.getXmdj())).abs();
if (abs.compareTo(new BigDecimal(djce)) > 0) { // if (abs.compareTo(new BigDecimal(djce)) > 0) {
Map map = new HashMap(); // Map map = new HashMap();
map.put("ddh", commonOrderInfo.getOrderInfo().getDdh()); // map.put("ddh", commonOrderInfo.getOrderInfo().getDdh());
map.put("ghfMc", commonOrderInfo.getOrderInfo().getGhfMc()); // map.put("ghfMc", commonOrderInfo.getOrderInfo().getGhfMc());
map.put("xhfMc", commonOrderInfo.getOrderInfo().getXhfMc()); // map.put("xhfMc", commonOrderInfo.getOrderInfo().getXhfMc());
map.put("jshj", commonOrderInfo.getOrderInfo().getKphjje()); // map.put("jshj", commonOrderInfo.getOrderInfo().getKphjje());
djOverflowList.add(map); // djOverflowList.add(map);
} // }
} // }
} else { // }
log.error("{}校验单价容差范围发生错误:在原结算单中未匹配到唯一明细,找到了{}条", LOGGER_MSG, collect.size()); // else {
throw new RuntimeException("校验单价容差范围发生错误:在原结算单中未匹配到唯一明细"); // log.error("{}校验单价容差范围发生错误:在原结算单中未匹配到唯一明细,找到了{}条", LOGGER_MSG, collect.size());
} // throw new RuntimeException("校验单价容差范围发生错误:在原结算单中未匹配到唯一明细");
// }
}); });
}); });
} }
@ -1596,25 +1596,27 @@ public class InvoiceServiceImpl implements InvoiceService {
orderInfoIdList.stream().forEach(id->{ orderInfoIdList.stream().forEach(id->{
OrderInfo orderInfo = orderInfoMapper.selectOrderInfoByOrderId(id, null); OrderInfo orderInfo = orderInfoMapper.selectOrderInfoByOrderId(id, null);
BuyerEntity buyerEntity = buyerMapper.queryBuyerInfoByGhfIdAndEntId(orderInfo.getGhfId(), orderInfo.getEntId()); BuyerEntity buyerEntity = buyerMapper.queryBuyerInfoByGhfIdAndEntId(orderInfo.getGhfId(), orderInfo.getEntId());
if (buyerEntity == null) { // if (buyerEntity == null) {
throw new RuntimeException("结算单:"+orderInfo.getDdh()+"购方信息为空,请补全!"); // throw new RuntimeException("结算单:"+orderInfo.getDdh()+"购方信息为空,请补全!");
} // }
if (OrderInfoEnum.CHECK_BANK_FLAG_YES.getKey().equals(buyerEntity.getCheckBankFlag())) { if (buyerEntity != null) {
log.info("开始校验客户信息完整"); if (OrderInfoEnum.CHECK_BANK_FLAG_YES.getKey().equals(buyerEntity.getCheckBankFlag())) {
if (StrUtil.isBlank(orderInfo.getGhfNsrsbh())) { log.info("开始校验客户信息完整");
throw new RuntimeException("结算单:"+orderInfo.getDdh()+"购方纳税人识别号为空,请补全!"); if (StrUtil.isBlank(orderInfo.getGhfNsrsbh())) {
} throw new RuntimeException("结算单:"+orderInfo.getDdh()+"购方纳税人识别号为空,请补全!");
if (StrUtil.isBlank(orderInfo.getGhfDz())) { }
throw new RuntimeException("结算单:"+orderInfo.getDdh()+"购方地址为空,请补全!"); if (StrUtil.isBlank(orderInfo.getGhfDz())) {
} throw new RuntimeException("结算单:"+orderInfo.getDdh()+"购方地址为空,请补全!");
if (StrUtil.isBlank(orderInfo.getGhfDh())) { }
throw new RuntimeException("结算单:"+orderInfo.getDdh()+"购方电话为空,请补全!"); if (StrUtil.isBlank(orderInfo.getGhfDh())) {
} throw new RuntimeException("结算单:"+orderInfo.getDdh()+"购方电话为空,请补全!");
if (StrUtil.isBlank(orderInfo.getGhfYh())) { }
throw new RuntimeException("结算单:"+orderInfo.getDdh()+"购方开户行为空,请补全!"); if (StrUtil.isBlank(orderInfo.getGhfYh())) {
} throw new RuntimeException("结算单:"+orderInfo.getDdh()+"购方开户行为空,请补全!");
if (StrUtil.isBlank(orderInfo.getGhfZh())) { }
throw new RuntimeException("结算单:"+orderInfo.getDdh()+"购方银行账号为空,请补全!"); if (StrUtil.isBlank(orderInfo.getGhfZh())) {
throw new RuntimeException("结算单:"+orderInfo.getDdh()+"购方银行账号为空,请补全!");
}
} }
} }
}); });

Write Preview
Loading…
Cancel
Save