task:4173 test

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/GroupManagementService.java

@@ -54,11 +54,4 @@ public interface GroupManagementService {
      */
     List<GroupManagementEntity> queryByGroupIdList(List<String> groupIdList);
 
-    /**
-     * 判断是不是内部关联交易且是一个税号对应多个公司代码的填上备注
-     * @param entId
-     * @param ghfId
-     * @return
-     */
-    Boolean checkInvoiceRemarksFlag(String entId,String ghfId);
 }

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/groupmanagement/service/impl/GroupManagementServiceImpl.java

@@ -206,26 +206,6 @@ public class GroupManagementServiceImpl implements GroupManagementService {
         return groupManagementMapper.queryByGroupIdList(groupIdList, OrderInfoEnum.ORDER_KPZZGL_CXLX_1.getKey());
     }
 
-    @Override
-    @Transactional(readOnly = true)
-    public Boolean checkInvoiceRemarksFlag(String xfnsrsbh, String ghfId) {
-        if (StringUtils.isBlank(xfnsrsbh)) {
-            return Boolean.FALSE;
-        }
-        if (StringUtils.isBlank(ghfId)) {
-            return Boolean.FALSE;
-        }
-        if (groupManagementMapper.countEntIdNumByXfnsrsbh(xfnsrsbh) <= 1) {
-            return Boolean.FALSE;
-        }
-        if (ghfId.length()<=6) {
-            return Boolean.FALSE;
-        }
-        if (!"000006".equals(ghfId.substring(0,6))) {
-            return Boolean.FALSE;
-        }
-        return Boolean.TRUE;
-    }
 
     /**
      * 构建组织树集合

order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/GsClientMapper.java

@@ -24,4 +24,6 @@ public interface GsClientMapper {
     int updateByPrimaryKeySelective(GsClient record);
 
     int updateByPrimaryKey(GsClient record);
+
+    int countGsdm(@Param("gsdm") String gsdm);
 }

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

@@ -220,4 +220,13 @@ public interface OrderInfoService {
 
     @Transactional
     R mergeOrderItem(String entId,String orderInfoId,List<String> itemList);
+
+
+    /**
+     * 判断是不是内部关联交易且是一个税号对应多个公司代码的填上备注
+     * @param entId
+     * @param ghfId
+     * @return
+     */
+    Boolean checkInvoiceRemarksFlag(String entId,String ghfId);
 }

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

@@ -12,6 +12,7 @@ import com.dxhy.order.baseservice.config.BaseServiceConfig;
 import com.dxhy.order.baseservice.module.buyer.model.BuyerEntity;
 import com.dxhy.order.baseservice.module.buyer.service.BuyerService;
 import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity;
+import com.dxhy.order.baseservice.module.groupmanagement.dao.GroupManagementMapper;
 import com.dxhy.order.baseservice.module.taxclass.dao.TaxClassCodeMapper;
 import com.dxhy.order.baseservice.module.thirdservice.simsback.service.SimsBackService;
 import com.dxhy.order.baseservice.module.thirdservice.user.model.DeptEntity;
@@ -21,6 +22,7 @@ import com.dxhy.order.constant.OrderInfoContentEnum;
 import com.dxhy.order.constant.OrderInfoEnum;
 import com.dxhy.order.constant.OrderManagementConstant;
 import com.dxhy.order.consumer.dao.GroupCommodityCodeMapper;
+import com.dxhy.order.consumer.dao.GsClientMapper;
 import com.dxhy.order.consumer.dao.OrderBatchRequestMapper;
 import com.dxhy.order.consumer.dao.OrderProcessInfoMapper;
 import com.dxhy.order.consumer.model.OderDetailInfo;
@@ -164,6 +166,12 @@ public class OrderInfoServiceImpl implements OrderInfoService {
     @Resource
     private OrderBatchRequestMapper orderBatchRequestMapper;
 
+    @Resource
+    private GroupManagementMapper groupManagementMapper;
+
+    @Resource
+    private GsClientMapper gsClientMapper;
+
     @Override
     public PageUtils selectOrderInfo(Map<String, Object> map, List<String> shList, List<String> entList) {
         return orderProcessService.selectOrderInfo(map, shList, entList);
@@ -1916,6 +1924,30 @@ public class OrderInfoServiceImpl implements OrderInfoService {
         return R.ok();
     }
 
+    @Override
+    @Transactional(readOnly = true)
+    public Boolean checkInvoiceRemarksFlag(String xfnsrsbh, String ghfId) {
+        if (StringUtils.isBlank(xfnsrsbh)) {
+            return Boolean.FALSE;
+        }
+        if (StringUtils.isBlank(ghfId)) {
+            return Boolean.FALSE;
+        }
+        if (groupManagementMapper.countEntIdNumByXfnsrsbh(xfnsrsbh) <= 1) {
+            return Boolean.FALSE;
+        }
+        if (ghfId.length()<=6) {
+            return Boolean.FALSE;
+        }
+        if (!"000060".equals(ghfId.substring(0,6))) {
+            return Boolean.FALSE;
+        }
+        if (gsClientMapper.countGsdm(ghfId.replace("000060","")) == 0) {
+            return Boolean.FALSE;
+        }
+        return Boolean.TRUE;
+    }
+
     private void completeCommodityMessageBySpid(OrderItemInfo item, CommodityCodeEntity commodity) {
         //商品编码
         item.setSpbm(commodity.getSpbm());

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

@@ -132,6 +132,9 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt
     private GroupManagementService groupManagementService;
     @Resource
     private InvoiceRemarkSetService invoiceRemarkSetService;
+
+    @Resource
+    private OrderInfoService orderInfoService;
     /**
      * 发票开具接口
      *
@@ -887,7 +890,7 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt
             }
             // 拼接公司代码备注信息
             insertOrder.stream().forEach(item->{
-                if (groupManagementService.checkInvoiceRemarksFlag(item.getXhfNsrsbh(), item.getGhfId())) {
+                if (orderInfoService.checkInvoiceRemarksFlag(item.getXhfNsrsbh(), item.getGhfId())) {
                     log.info("ddpcxxReq:{}", JSONObject.toJSONString(ddpcxxReq));
                     item.setBz(item.getBz()+";销方公司代码:"+ddpcxxReq.getDDZXX().get(0).getDDTXX().getXHFBM()+",销方公司名称:"+item.getXhfMc()+";");
                 }

order-management-consumer/src/main/resources/mybatis/mapper/GsClientMapper.xml

@@ -22,6 +22,12 @@
     <include refid="Base_Column_List" />
     from gs_client
     where gsdm = #{gsdm,jdbcType=VARCHAR}
+  </select>
+  <select id="countGsdm" resultType="java.lang.Integer">
+
+    select count(1) from gs_client where gsdm=#{gsdm}
+
+
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from gs_client