fix: 结算单管理联调问题修改

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_1.getKey());
+        userInfoQuery.setIsFilter(OrderInfoEnum.ORDER_USER_INFO_IS_FILTER_2.getKey());
 
         R r = userInfoService.getUserInfo(userInfoQuery);
 

order-management-common/src/main/java/com/dxhy/order/model/page/OrderListQuery.java

@@ -267,6 +267,14 @@ public class OrderListQuery {
      * 凭证过账日期
      */
     private Date pzgzrq;
+    /**
+     * 凭证过账日期起
+     */
+    private String pzgzrqBegin;
+    /**
+     * 凭证过账日期止
+     */
+    private String pzgzrqEnd;
     /**
      * 是否预制发票
      */

order-management-common/src/main/java/com/dxhy/order/utils/PageBeanConvertUtil.java

@@ -198,7 +198,18 @@ public class PageBeanConvertUtil {
         resultMap.put("originDdh", orderListQuery.getOriginDdh());
         resultMap.put("originOrderId", orderListQuery.getOriginOrderId());
         resultMap.put("kb", orderListQuery.getKb());
-
+        if (StringUtils.isNotBlank(orderListQuery.getPzgzrqBegin())) {
+            Date parse = DateUtil.parse(orderListQuery.getPzgzrqBegin(), "yyyy-MM-dd");
+            parse = DateUtil.beginOfDay(parse);
+            String startTime = DateUtil.format(parse, "yyyy-MM-dd");
+            resultMap.put("pzgzrqBegin", startTime);
+        }
+        if (StringUtils.isNotBlank(orderListQuery.getPzgzrqEnd())) {
+            Date parse = DateUtil.parse(orderListQuery.getPzgzrqEnd(), "yyyy-MM-dd");
+            parse = DateUtil.endOfDay(parse);
+            String endTime = DateUtil.format(parse, "yyyy-MM-dd");
+            resultMap.put("pzgzrqEnd", endTime);
+        }
         return resultMap;
 
     }

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

@@ -233,5 +233,10 @@ public class OderDetailInfo {
 
     private List<PageOrderExt> pageOrderExts;
 
+    /**
+     * 报账单号
+     */
+    private String bzdh;
+
 
 }

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

@@ -149,7 +149,7 @@ public class InvoiceServiceImpl implements InvoiceService {
                 });
             }
         });
-        return R.ok("生成预制发票成功,请到开票处理页面查看");
+        return R.ok("生成预制发票成功,请到发票处理页面查看");
     }
 
     @Override

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java

@@ -262,6 +262,18 @@ public class OrderInfoController {
             return R.error(ConfigureConstant.STRING_9999, "订单编辑异常");
         }
     }
+
+    /**
+     * @Description: 填写冲红信息
+     * @Param: [param]
+     * @Return: com.dxhy.order.model.R
+     * @Author: liufeilong
+     * @Date: 2023-03-16
+     */
+    @PostMapping("/fillRedMessage")
+    public R fillRedMessage(@RequestBody Map<String,String> param){
+        return orderInfoService.fillRedMessage(param);
+    }
     
     /**
      * 订单详情

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/model/bo/OriginOrderBO.java

@@ -25,5 +25,7 @@ public class OriginOrderBO {
     private Integer isdel;
     private String originOrderId;
     private String bzdh;
+    private String kb;
+    private String pzgzrq;
     
 }

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

@@ -194,4 +194,6 @@ public interface OrderInfoService {
      * @return
      */
     List<PageKySlRsp> queryAvailableSlList(PageKySlReq pageKySlReq) throws OrderReceiveException;
+
+    R fillRedMessage(Map<String,String> param);
 }

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

@@ -623,6 +623,9 @@ public class GenerateReadyOpenOrderServiceImpl implements GenerateReadyOpenOrder
             orderProcessInfo.setNum(commonOrderInfo.getNum());
             orderProcessInfo.setDdly(commonOrderInfo.getProcessInfo().getDdly());
             orderProcessInfo.setDdzt(commonOrderInfo.getProcessInfo().getDdzt());
+            orderProcessInfo.setBzdh(commonOrderInfo.getProcessInfo().getBzdh());
+            orderProcessInfo.setYzfp(commonOrderInfo.getProcessInfo().getYzfp());
+            orderProcessInfo.setKb(orderItemInfos.get(0).getKb());
 
 
             //原始订单到最终订单的关系

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

@@ -1903,6 +1903,7 @@ public class OrderExcelReadServiceImpl implements OrderExcelReadService {
             processInfo.setDdly(OrderInfoEnum.ORDER_SOURCE_0.getKey());
             processInfo.setDdzt(OrderInfoEnum.ORDER_STATUS_0.getKey());
             processInfo.setBzdh(newOrderExcel.getBzdh());
+            processInfo.setYzfp(ConfigureConstant.STRING_0);
             orderExcel2CommonOrderInfo.setProcessInfo(processInfo);
             orderExcel2CommonOrderInfo.getOrderInfo().setDdlx(OrderInfoEnum.ORDER_SOURCE_0.getKey());
             orderExcel2CommonOrderInfo.setNum(i);

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

@@ -392,6 +392,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
         oderDetailInfo.setEditStatus(orderProcessInfo.getEditStatus());
         oderDetailInfo.setCheckStatus(orderProcessInfo.getCheckStatus());
         oderDetailInfo.setCheckTime(DateUtil.format(orderProcessInfo.getCheckTime(), "yyyy-MM-dd HH:mm:ss"));
+        oderDetailInfo.setBzdh(orderProcessInfo.getBzdh());
         return oderDetailInfo;
     }
 
@@ -1557,6 +1558,20 @@ public class OrderInfoServiceImpl implements OrderInfoService {
         return pageKySlRspList;
     }
 
+    @Override
+    public R fillRedMessage(Map<String, String> param) {
+        String orderInfoId = param.get("orderInfoId");
+        String yfpDm = param.get("yfpDm");
+        String yfpHm = param.get("yfpHm");
+        String hzxxbbh = param.get("hzxxbbh");
+        OrderInfo orderInfo = orderInfoService.selectOrderInfoByOrderId(orderInfoId, null);
+        orderInfo.setYfpDm(yfpDm);
+        orderInfo.setYfpHm(yfpHm);
+        orderInfo.setHzxxbbh(hzxxbbh);
+        orderInfoService.updateOrderInfoByOrderId(orderInfo,null);
+        return R.ok();
+    }
+
     private PageKySlRsp getDefaultKySlList(OrderInfoEnum orderInfoEnum){
         PageKySlRsp pageKySlRsp = new PageKySlRsp();
         pageKySlRsp.setSl(orderInfoEnum.getKey());

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

@@ -26,6 +26,8 @@
         <result column="isDel" jdbcType="VARCHAR" property="isdel"/>
         <result column="origin_order_id" jdbcType="VARCHAR" property="originOrderId"/>
         <result column="bzdh" jdbcType="VARCHAR" property="bzdh"/>
+        <result column="kb" jdbcType="VARCHAR" property="kb"/>
+        <result column="pzgzrq" jdbcType="VARCHAR" property="pzgzrq"/>
     </resultMap>
 
     <resultMap id="queryOriginOrderCompareResultMap" type="com.dxhy.order.consumer.modules.order.model.bo.OriginOrderExtendCompareBO">
@@ -179,7 +181,9 @@
         op.ghf_mc,
         op.id,
         op.num,
-        op.bzdh
+        op.bzdh,
+        op.kb,
+        op.pzgzrq
         FROM order_orgin_extend_info ooe
         LEFT JOIN
         order_process_info op ON ooe.origin_order_id = op.order_info_id
@@ -292,6 +296,15 @@
             <if test="map.bzdh !=null and map.bzdh !='' ">
                 and op.bzdh = #{map.bzdh,jdbcType=VARCHAR}
             </if>
+            <if test="map.kb !=null and map.kb !='' ">
+                and op.kb = #{map.kb,jdbcType=VARCHAR}
+            </if>
+            <if test="map.pzgzrqBegin !=null and map.pzgzrqBegin != ''">
+                and op.pzgzrq >= #{map.pzgzrqBegin}
+            </if>
+            <if test="map.pzgzrqEnd !=null and map.pzgzrqEnd != ''">
+                and #{map.pzgzrqEnd} >= op.pzgzrq
+            </if>
             <if test="shList != null and shList.size() == 0">
                 and op.xhf_nsrsbh = ''
             </if>
@@ -365,6 +378,15 @@
             <if test="map.bzdh != null and map.bzdh != ''">
                 and op.bzdh = #{map.bzdh,jdbcType=VARCHAR}
             </if>
+            <if test="map.kb !=null and map.kb !='' ">
+                and op.kb = #{map.kb,jdbcType=VARCHAR}
+            </if>
+            <if test="map.pzgzrqBegin !=null and map.pzgzrqBegin != ''">
+                and op.pzgzrq >= #{map.pzgzrqBegin}
+            </if>
+            <if test="map.pzgzrqEnd !=null and map.pzgzrqEnd != ''">
+                and #{map.pzgzrqEnd} >= op.pzgzrq
+            </if>
 
             <if test="shList != null and shList.size() == 0">
                 and op.xhf_nsrsbh = ''

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

@@ -608,6 +608,12 @@
             <if test="map.kb != null and map.kb != ''">
                 and op.kb = #{map.kb,jdbcType=VARCHAR}
             </if>
+            <if test="map.pzgzrqBegin !=null and map.pzgzrqBegin != ''">
+                and op.pzgzrq >= #{map.pzgzrqBegin}
+            </if>
+            <if test="map.pzgzrqEnd !=null and map.pzgzrqEnd != ''">
+                and #{map.pzgzrqEnd} >= op.pzgzrq
+            </if>
 
             <!-- 异常订单列表根据订单更新时间排序 -->
             <choose>