Merge branch 'release' of http://10.1.1.216/xm/sdenergy/sims/sims-order-sdenergy into release

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/controller/UserController.java

@@ -58,7 +58,7 @@ public class UserController {
     public R getUserDetails() {
         UserInfoQuery userInfoQuery = new UserInfoQuery();
         userInfoQuery.setBusinessDataType(OrderInfoEnum.ORDER_USER_INFO_BUSINESS_DATA_TYPE_2.getKey());
-        userInfoQuery.setIsFilter(OrderInfoEnum.ORDER_USER_INFO_IS_FILTER_2.getKey());
+        userInfoQuery.setIsFilter(OrderInfoEnum.ORDER_USER_INFO_IS_FILTER_1.getKey());
 
         R r = userInfoService.getUserInfo(userInfoQuery);
 

order-management-consumer/src/main/java/com/dxhy/order/consumer/model/OderDetailInfo.java

@@ -57,6 +57,8 @@ public class OderDetailInfo {
 
     private String ghfZh;
 
+    private String ghfStatus;
+
     private String xhfMc;
 
     private String xhfNsrsbh;

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

@@ -186,7 +186,10 @@ public class InvoiceServiceImpl implements InvoiceService {
                         List<RuleSplitEntity> ruleSplitEntityList = ruleSplitService.queryRuleSplit(commonOrderInfo.getOrderInfo().getXhfNsrsbh(), pageInvoiceReq.getUserId());
                         log.info("税号：{}，用户ID:{},查询的拆分限额信息结果：{}", commonOrderInfo.getOrderInfo().getXhfNsrsbh(),
                                 pageInvoiceReq.getUserId(), JsonUtils.getInstance().toJsonString(ruleSplitEntityList));
-                        String djce = ruleSplitEntityList.get(0).getDjce();
+                        String djce = ConfigureConstant.STRING_0;
+                        if(ruleSplitEntityList.size() != 0){
+                            djce = StrUtil.isBlank(ruleSplitEntityList.get(0).getDjce())?ConfigureConstant.STRING_0:ruleSplitEntityList.get(0).getDjce();
+                        }
                         BigDecimal abs = new BigDecimal(collect.get(0).getXmdj()).subtract(new BigDecimal(splitItem.getXmdj())).abs();
                         if (abs.compareTo(new BigDecimal(djce)) > 0) {
                             Map map = new HashMap();

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java

@@ -3,6 +3,7 @@ package com.dxhy.order.consumer.modules.order.service.impl;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.RandomUtil;
+import cn.hutool.core.util.StrUtil;
 import com.dxhy.base.constant.OrderSeparationException;
 import com.dxhy.base.constant.TaxSeparateConfig;
 import com.dxhy.base.utils.PriceTaxSeparationUtilNew;
@@ -322,6 +323,18 @@ public class OrderInfoServiceImpl implements OrderInfoService {
         oderDetailInfo.setGhfDh(orderInfo.getGhfDh());
         oderDetailInfo.setGhfYh(orderInfo.getGhfYh());
         oderDetailInfo.setGhfZh(orderInfo.getGhfZh());
+        BuyerEntity buyerEntity = null;
+        if (StrUtil.isNotBlank(orderInfo.getGhfId())) {
+            buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(orderInfo.getXhfNsrsbh(), orderInfo.getGhfId());
+            if (ObjectUtil.isNull(buyerEntity)) {
+                buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(ConfigureConstant.STRING_1_, orderInfo.getGhfId());
+            }
+        }
+        if (ObjectUtil.isNotNull(buyerEntity) && ConfigureConstant.STRING_0.equals(buyerEntity.getStatus())) {
+            oderDetailInfo.setGhfStatus(ConfigureConstant.STRING_0);
+        }else {
+            oderDetailInfo.setGhfStatus(ConfigureConstant.STRING_1);
+        }
 
 
 //        添加销方信息

order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/AllocateInvoiceInterfaceServiceImplV3.java

@@ -875,13 +875,13 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt
                 for (int i = 0; i < mbnrList.size(); i++) {
                     String s = mbnrList.get(i);
                     if (OrderInfoEnum.INVOICE_REMARK_SET_BZDH.getValue().equals(s)) {
-                        insertOrder.get(0).setBz(insertOrder.get(0).getBz() + OrderInfoEnum.INVOICE_REMARK_SET_BZDH.getValue() + ":" + insertProcessInfo.get(0).getBzdh() + (i == mbnrList.size() - 1 ? "" : ","));
+                        insertOrder.get(0).setBz((ObjectUtil.isNull(insertOrder.get(0).getBz())?"":insertOrder.get(0).getBz()) + OrderInfoEnum.INVOICE_REMARK_SET_BZDH.getValue() + ":" + insertProcessInfo.get(0).getBzdh() + (i == mbnrList.size() - 1 ? "" : ","));
                     }
                     if (OrderInfoEnum.INVOICE_REMARK_SET_JSDH.getValue().equals(s)) {
-                        insertOrder.get(0).setBz(insertOrder.get(0).getBz() + OrderInfoEnum.INVOICE_REMARK_SET_JSDH.getValue() + ":" + insertProcessInfo.get(0).getDdh() + (i == mbnrList.size() - 1 ? "" : ","));
+                        insertOrder.get(0).setBz((ObjectUtil.isNull(insertOrder.get(0).getBz())?"":insertOrder.get(0).getBz()) + OrderInfoEnum.INVOICE_REMARK_SET_JSDH.getValue() + ":" + insertProcessInfo.get(0).getDdh() + (i == mbnrList.size() - 1 ? "" : ","));
                     }
                     if (OrderInfoEnum.INVOICE_REMARK_SET_KB.getValue().equals(s)) {
-                        insertOrder.get(0).setBz(insertOrder.get(0).getBz() + OrderInfoEnum.INVOICE_REMARK_SET_KB.getValue() + ":" + insertProcessInfo.get(0).getKb() + (i == mbnrList.size() - 1 ? "" : ","));
+                        insertOrder.get(0).setBz((ObjectUtil.isNull(insertOrder.get(0).getBz())?"":insertOrder.get(0).getBz()) + OrderInfoEnum.INVOICE_REMARK_SET_KB.getValue() + ":" + insertProcessInfo.get(0).getKb() + (i == mbnrList.size() - 1 ? "" : ","));
                     }
                 }
             }
@@ -1146,6 +1146,7 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt
         if (StringUtils.isNotBlank(commonOrderInfo.getOrderInfo().getGhfId())) {
             String zxbm = commonOrderInfo.getOrderInfo().getGhfId();
             zxbm = StringUtils.right(zxbm, 6); // 见下dealOrderItem中 line:550左右注释
+            commonOrderInfo.getOrderInfo().setGhfId(zxbm);
             BuyerEntity buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(commonOrderInfo.getOrderInfo().getXhfNsrsbh(), zxbm);
             if (buyerEntity != null && StringUtils.isNotBlank(buyerEntity.getTaxpayerCode())) {
                 BeanTransitionUtils.transitionOrderBuyerInfo(commonOrderInfo, buyerEntity);

order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/InterfaceServiceImplV6.java

@@ -173,7 +173,7 @@ public class InterfaceServiceImplV6 implements InterfaceServiceV6 {
         InterfaceRequestData data = new InterfaceRequestData();
         data.setId(DistributedKeyMaker.generateShotKey());
         data.setYwlx(interfaceName);
-        data.setBatchId(poCommonRequestParam.getIS_INPUT().getBSKEY());
+        data.setBatchId(poCommonRequestParam.getIS_INPUT().getSAPKEY());
         data.setRequestData(param);
         data.setCreateTime(new Date());
         interfaceRequestDataMapper.insert(data);