Merge remote-tracking branch 'origin/release' into release

2 years ago · 11c9afbd4c
parent 6df223494c f1ad20e550
commit 11c9afbd4c
9 changed files with 679 additions and 568 deletions
--- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/model/BuyerEntity.java
+++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/model/BuyerEntity.java
@ -139,4 +139,5 @@ public class BuyerEntity implements Serializable {
    private String syncOrder;

    private String entId;
+    private String deptId;
 }
--- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java
+++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java
@ -140,6 +140,7 @@ public class BuyerServiceImpl implements BuyerService {
            /**
             * 导入数据不校验必填
             */
+            buyerEntity.setSyncOrder("0");
            if (StringUtils.isBlank(buyerEntity.getBuyerCode())) {
                buyerEntity.setBuyerCode(baseService.getGenerateShotKey());
            }
@ -349,23 +350,19 @@ public class BuyerServiceImpl implements BuyerService {
        /**
         * 根据入参进行判断是新增还是修改
         */
+        Boolean isAdd = false;
+        if(StringUtils.isBlank(buyerEntity.getId())){
+            isAdd = true;
+        }
+        if(buyerEntity.getSynchronizeOrders()){
+            buyerEntity.setSyncOrder("1");
+        }else{
+            buyerEntity.setSyncOrder("0");
+        }
        List<String> shList = new ArrayList<>();
        shList.add(buyerEntity.getXhfNsrsbh());
        R r = new R();

-        BuyerEntity queryBuyerEntity = new BuyerEntity();
-        queryBuyerEntity.setBuyerCode(buyerEntity.getId());
-        BuyerEntity entity = buyerMapper.selectBuyerByCodeOrNameAndNsrsbh("", buyerEntity.getBuyerCode(), null);
-        if(entity != null){
-            if (StringUtils.isNotBlank(buyerEntity.getId())) {
-                if(!buyerEntity.getId().equals(entity.getId())){
-                    return r.put("message", "客户编码已存在").put(OrderManagementConstant.CODE, ConfigureConstant.STRING_9999);
-                }
-            }else {
-                return r.put("message", "客户编码已存在").put(OrderManagementConstant.CODE, ConfigureConstant.STRING_9999);
-            }
-        }
-
 //        if (ConfigureConstant.STRING_1.equals(buyerEntity.getIsEdit()) && StringUtils.isBlank(buyerEntity.getId())) {
        BuyerEntity existBuyer = isExistBuyer(buyerEntity);
        if (ObjectUtil.isNotNull(existBuyer)) {
@ -396,6 +393,9 @@ public class BuyerServiceImpl implements BuyerService {
            buyerMapper.deleteBuyerDetail(buyerEntity.getId());
            buyerMapper.batchInsertBuyerDetail(buyerEntity.getBuyerEntityDetail());
        }
+        if(isAdd && existBuyer != null){
+            return r.put("message", "客户编码已存在").put(OrderManagementConstant.CODE, ConfigureConstant.STRING_9999);
+        }
        if (existBuyer != null) {//StringUtils.isNotBlank(buyerEntity.getId())

            buyerEntity.setModifyTime(new Date());
@ -419,10 +419,6 @@ public class BuyerServiceImpl implements BuyerService {
            }
        }

-        if("0".equals(buyerEntity.getSynchronizeOrders())){
-            //更新订单
-        }
-
        return R.ok().put(OrderManagementConstant.MESSAGE, "保存成功!");

    }
--- a/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml
+++ b/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml
@ -26,6 +26,7 @@
        <result column="mdm_multicode_json" jdbcType="VARCHAR" property="mdmMulticodeJson"/>
        <result column="status" jdbcType="VARCHAR" property="status"/>
        <result column="sync_order" jdbcType="VARCHAR" property="syncOrder"/>
+        <result column="ent_id" jdbcType="VARCHAR" property="deptId"/>
        <collection property="buyerEntityDetail" ofType="com.dxhy.order.baseservice.module.buyer.model.BuyerEntityDetail">
            <id column="consumer_id" property="consumerId"/>
            <result column="buyer_manage_id" jdbcType="VARCHAR" property="buyerManageId"/>
@ -68,6 +69,7 @@
            bmi.create_time,
            bmi.status,
            bmi.sync_order,
+            bmi.ent_id,
            bmid.consumer_id,
            bmid.buyer_manage_id,
            bmid.bank_name,
@ -152,7 +154,8 @@
            buyer_code,
            rownum as rowno,
            status,
-            sync_order
+            sync_order,
+            ent_id
            FROM
            buyer_manage_info
            <where>
@ -280,6 +283,9 @@
            <if test="buyer.syncOrder != null ">
                sync_order = #{buyer.syncOrder,jdbcType=VARCHAR},
            </if>
+            <if test="buyer.deptId != null ">
+                ent_id = #{buyer.deptId,jdbcType=VARCHAR},
+            </if>
        </set>
        <where>
            id = #{buyer.id,jdbcType=VARCHAR}
@ -371,6 +377,9 @@
            <if test="buyer.syncOrder != null ">
                sync_order = #{buyer.syncOrder,jdbcType=VARCHAR},
            </if>
+            <if test="buyer.deptId != null ">
+                ent_id = #{buyer.deptId,jdbcType=VARCHAR},
+            </if>
        </set>
        <where>
            id in
@ -497,6 +506,9 @@
            <if test="syncOrder != null">
                sync_order,
            </if>
+            <if test="deptId != null">
+                ent_id,
+            </if>

        </trim>

@ -573,6 +585,9 @@
            <if test="syncOrder != null">
                #{syncOrder,jdbcType=VARCHAR},
            </if>
+            <if test="deptId != null">
+                #{deptId,jdbcType=VARCHAR},
+            </if>
        </trim>
    </insert>

@ -792,7 +807,8 @@
        invoice_taxno,
        mdm_multicode_json,
        status,
-        sync_order
+        sync_order,
+        ent_id
        )
        values
        <foreach collection="list" item="item" index="index"
@ -821,6 +837,7 @@
            #{item.mdmMulticodeJson,jdbcType=VARCHAR},
            #{item.status,jdbcType=VARCHAR},
            #{item.syncOrder,jdbcType=VARCHAR},
+            #{item.entId,jdbcType=VARCHAR}
            )
        </foreach>
    </insert>
@ -890,8 +907,10 @@
        </if>
        modify_user_id,
        ghf_qylx,
+        buyer_code,
        status,
-        sync_order
+        sync_order,
+        ent_id
        FROM
        buyer_manage_info
        <where>
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java
@ -7,6 +7,7 @@ import com.dxhy.order.baseservice.annotation.SysLog;
 import com.dxhy.order.baseservice.config.BaseServiceConfig;
 import com.dxhy.order.baseservice.module.base.service.ExcelReadService;
 import com.dxhy.order.baseservice.module.buyer.model.BuyerEntity;
+import com.dxhy.order.baseservice.module.buyer.model.BuyerEntityDetail;
 import com.dxhy.order.baseservice.module.buyer.model.BuyerImportExcel;
 import com.dxhy.order.baseservice.module.buyer.model.BuyerImportExcelEnum;
 import com.dxhy.order.baseservice.module.buyer.service.BuyerService;
@ -34,6 +35,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.*;
+import java.util.stream.Stream;

 /**
 * 购方信息控制层
@ -146,9 +148,34 @@ public class BuyerController {
    @ApiOperation(value = "购方信息批量保存", notes = "购方信息管理-购方信息批量保存")
    @PostMapping("/saveBuyerInfoList")
    public R saveBuyerInfoList(@RequestBody List<BuyerEntity> buyerList) {
-        //todo 更新订单购方信息
-        OrderInfo orderInfo = new OrderInfo();
-        //orderInfoService.updateOrderInfoByOrderId();
+
+        if(buyerList != null && buyerList.size()==1){
+            BuyerEntity buyerEntity = buyerList.get(0);
+            if(StringUtils.isBlank(buyerEntity.getDeptId())){
+                return R.error("请求参数有误");
+            }
+
+            if(buyerEntity.getSynchronizeOrders()){
+
+                OrderInfo orderInfo = new OrderInfo();
+                orderInfo.setGhfMc(StringUtils.isBlank(buyerEntity.getTaxpayerCode())?null:buyerEntity.getTaxpayerCode());
+                orderInfo.setGhfNsrsbh(StringUtils.isBlank(buyerEntity.getPurchaseName())?null:buyerEntity.getPurchaseName());
+                if(buyerEntity.getBuyerEntityDetail() != null && buyerEntity.getBuyerEntityDetail().size() > 0 ){
+                   buyerEntity.getBuyerEntityDetail().forEach(t->{
+                       if("0".equals(t.getDefaultMark())){
+                           orderInfo.setGhfDz(StringUtils.isBlank(buyerEntity.getAddress())?null:buyerEntity.getAddress());
+                           orderInfo.setGhfDh(StringUtils.isBlank(buyerEntity.getPhone())?null:buyerEntity.getPhone());
+                           orderInfo.setGhfYh(StringUtils.isBlank(buyerEntity.getBankOfDeposit())?null:buyerEntity.getBankOfDeposit());
+                           orderInfo.setGhfZh(StringUtils.isBlank(buyerEntity.getBankNumber())?null:buyerEntity.getBankNumber());
+                       }
+                   });
+                }
+                orderInfo.setEntId(buyerEntity.getDeptId());
+                orderInfo.setGhfSj(StringUtils.isBlank(buyerEntity.getSjh())?null:buyerEntity.getSjh());
+                orderInfo.setGhfEmail(StringUtils.isBlank(buyerEntity.getEmail())?null:buyerEntity.getEmail());
+                orderInfoService.updateOrderBuyerInfo(orderInfo,null);
+            }
+        }
        // 业务逻辑放到provider
        return buyerService.saveBuyerInfoList(buyerList,
                userInfoService.getUser().getUserId() == null ? "" : String.valueOf(userInfoService.getUser().getUserId()));
@ -186,7 +213,8 @@ public class BuyerController {
                         @ApiParam(name = "xhfDh", value = "销货方电话", required = true) @RequestParam(value = "xhfDh") String xhfDh,
                         @ApiParam(name = "xhfZh", value = "销货方账号", required = true) @RequestParam(value = "xhfZh") String xhfZh,
                         @ApiParam(name = "xhfNsrsbh", value = "销货方纳税人识别号", required = true) @RequestParam(value = "xhfNsrsbh") String xhfNsrsbh,
-                         @ApiParam(name = "xhfMc", value = "销货方纳税人名称", required = true) @RequestParam(value = "xhfMc") String xhfMc) {
+                         @ApiParam(name = "xhfMc", value = "销货方纳税人名称", required = true) @RequestParam(value = "xhfMc") String xhfMc,
+                         @ApiParam(name = "entId", value = "销货deptid", required = true) @RequestParam(value = "entId") String entId) {

        R r = new R();
        try {
@ -243,6 +271,7 @@ public class BuyerController {
                //购方名称 带中文括号的转换成英文括号
                // 购方名称 带中文括号的转换成英文括号
                buyerEntity.setPurchaseName(StringUtil.replaceStr(buyerEntity.getPurchaseName(), true));
+                buyerEntity.setEntId(entId);
                buyerEntityList.add(buyerEntity);
            }
            r = buyerService.importBuyerByExcel(buyerEntityList);
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderInfoService.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/OrderInfoService.java
@ -146,7 +146,7 @@ public interface OrderInfoService {
     * @param shList
     * @return
     */
-    //int updateOrderBuyerInfo(OrderInfo orderInfo, List<String> shList);
+    int updateOrderBuyerInfo(OrderInfo orderInfo, List<String> shList);

    /**
     * 根据原发票代码号码 查询原蓝票订单信息
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java
@ -3,6 +3,7 @@ package com.dxhy.order.consumer.modules.order.service.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.RandomUtil;
+import cn.hutool.core.util.StrUtil;
 import com.dxhy.base.constant.*;
 import com.dxhy.base.utils.OrderSplitUtilsNew;
 import com.dxhy.base.utils.PriceTaxSeparationUtilNew;
@ -194,6 +195,7 @@ public class GenerateReadyOpenOrderServiceImpl implements GenerateReadyOpenOrder
        orderProcessInfo.setDdly(OrderInfoEnum.ORDER_SOURCE_1.getKey());
        orderProcessInfo.setDdlx(OrderInfoEnum.ORDER_TYPE_3.getKey());
        orderProcessInfo.setDdzt(OrderInfoEnum.ORDER_STATUS_0.getKey());
+        orderProcessInfo.setYzfp(ConfigureConstant.STRING_1);
        commonOrderInfo.setProcessInfo(orderProcessInfo);
        commonOrderInfo.getOrderInfo().setCreateTime(new Date());
        commonOrderInfo.getOrderInfo().setUpdateTime(new Date());
@ -631,6 +633,9 @@ public class GenerateReadyOpenOrderServiceImpl implements GenerateReadyOpenOrder
            orderProcessInfo.setKb(orderItemInfos.get(0).getKb());
            orderProcessInfo.setOriginOrderId(orderInfo.getId());
            orderProcessInfo.setOriginDdh(orderInfo.getDdh());
+            if(ObjectUtil.isNull(orderProcessInfo.getGsdm()) || StrUtil.isBlank(orderProcessInfo.getGsdm())){
+                orderProcessInfo.setGsdm(orderInfo.getGsdm());
+            }


            //原始订单到最终订单的关系
--- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java
+++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java
@ -1176,6 +1176,11 @@ public class OrderInfoServiceImpl implements OrderInfoService {
        return orderMapper.updateOrderInfoByOrderId(orderInfo, shList);
    }

+    @Override
+    public int updateOrderBuyerInfo(OrderInfo orderInfo, List<String> shList){
+        return orderMapper.updateOrderBuyerInfo(orderInfo,shList);
+    }
+
    @Override
    public OrderInfo selectOrderInfoByOrderId(String id, List<String> shList) {
        return orderMapper.selectOrderInfoByOrderId(id, shList);
--- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/dao/OrderInfoMapper.java
+++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/dao/OrderInfoMapper.java
@ -46,8 +46,15 @@ public interface OrderInfoMapper {
     * @param shList
     * @return
     */
-    int updateOrderInfoByOrderId(@Param("orderInfo") OrderInfo orderInfo, @Param("shList") List<String> shList);
+    int updateOrderInfoByOrderId(@Param("orderInfo") OrderInfo orderInfo, @Param("ent") List<String> shList);

+    /**
+     * 根据销方税号
+     * @param orderInfo
+     * @param shList
+     * @return
+     */
+    int updateOrderBuyerInfo(@Param("orderInfo") OrderInfo orderInfo, @Param("shList")List<String> shList);
    /**
     * 通过发票代码号码查询所有order信息
     *
--- a/order-management-invoice/src/main/resources/mybatis/mapper/OrderInfoMapper.xml
+++ b/order-management-invoice/src/main/resources/mybatis/mapper/OrderInfoMapper.xml