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

# Conflicts:
#	order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/BaseXxlJobConfig.java

order-management-base-service/src/main/java/com/dxhy/order/baseservice/config/BaseXxlJobConfig.java

@@ -13,10 +13,10 @@ import org.springframework.context.annotation.Configuration;
  *
  * @author xuxueli 2017-04-28
  */
-// @Configuration
+//@Configuration
-// @ComponentScan(basePackages = "com.dxhy.order.baseservice.job")
+//@ComponentScan(basePackages = "com.dxhy.order.baseservice.job")
 @Slf4j
-// @RefreshScope
+@RefreshScope
 public class BaseXxlJobConfig {
 
     @Value("${xxl.job.admin.addresses}")

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

@@ -172,4 +172,14 @@ public class DeptEntity implements Serializable {
      * 组织类型（0:虚拟组织，1:实体组织）
      */
     private String groupType;
+
+    /**
+     * 开票组织名称
+     */
+    private String invoiceName;
+
+    /**
+     * 开票税号
+     */
+    private String invoiceNsrsbh;
 }

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

@@ -213,6 +213,19 @@ public class OrderProcessInfo implements Serializable {
      * 是否预制发票
      */
     private String yzfp;
+    /**
+     * 原始结算单号
+     */
+    private String originDdh;
+    /**
+     * 原始订单ID
+     */
+    private String originOrderId;
+    /**
+     * 矿别
+     */
+    private String kb;
+
 
 
 

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

@@ -56,6 +56,7 @@ public class InvoiceRemarkSetServiceImpl implements InvoiceRemarkSetService {
             for(int i=0;i<invoiceRemarkSetList.size();i++){
                 InvoiceRemarkSet invoiceRemarkSet = invoiceRemarkSetList.get(i);
                 invoiceRemarkSet.setId(baseService.getGenerateShotKey());
+                invoiceRemarkSet.setXh(i+1+"");
                 invoiceRemarkSet.setXhfNsrsbh(xhfNsrsbh);
                 invoiceRemarkSet.setGsbm(gsbm);
                 invoiceRemarkSet.setCreateTime(new Date());

order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v4/order/DdmxxxBO.java

@@ -120,5 +120,15 @@ public class DdmxxxBO implements Serializable {
     private String BYZD1;
     private String BYZD2;
     private String BYZD3;
+
+    /**
+     * 批号
+     */
+    private String PH;
+
+    /**
+     * 矿别
+     */
+    private String KB;
     
 }

order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v4/order/DdtxxBO.java

@@ -6,6 +6,7 @@ import lombok.Setter;
 import lombok.ToString;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 订单全数据协议bean
@@ -321,5 +322,47 @@ public class DdtxxBO implements Serializable {
     private String BYZD3;
     private String BYZD4;
     private String BYZD5;
+
+    /**
+     * 报账单号
+     */
+    private String BZDH;
+    /**
+     * 系统来源
+     */
+    private String XTLY;
+    /**
+     * 公司代码
+     */
+    private String GSDM;
+    /**
+     * 驳回状态
+     */
+    private String BHZT;
+    /**
+     * 员工姓名
+     */
+    private String YGXM;
+    /**
+     * 开票凭证号
+     */
+    private String KPPZH;
+    /**
+     * 凭证过账日期
+     */
+    private String PZGZRQ;
+    /**
+     * 是否预制发票
+     */
+    private String YZFP;
+    /**
+     * 原始订单号
+     */
+    private String ORIGINDDH;
+    /**
+     * 原始订单ID
+     */
+    private String ORIGINORDERID;
+
     
 }

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

@@ -32,10 +32,7 @@ import com.dxhy.order.consumer.modules.order.service.OrderProcessService;
 import com.dxhy.order.consumer.modules.validate.service.ValidateInterfaceOrderService;
 import com.dxhy.order.consumer.modules.validate.service.ValidateOrderInfoService;
 import com.dxhy.order.consumer.openapi.protocol.v4.checklimit.RedisCheckLimit;
-import com.dxhy.order.consumer.openapi.protocol.v4.order.DdkzxxBO;
+import com.dxhy.order.consumer.openapi.protocol.v4.order.*;
-import com.dxhy.order.consumer.openapi.protocol.v4.order.DdpcxxReqBO;
-import com.dxhy.order.consumer.openapi.protocol.v4.order.DdpcxxRspBO;
-import com.dxhy.order.consumer.openapi.protocol.v4.order.DdzxxBO;
 import com.dxhy.order.consumer.openapi.service.AllocateInvoiceInterfaceServiceV3;
 import com.dxhy.order.consumer.openapi.service.CommonInterfaceService;
 import com.dxhy.order.consumer.utils.BeanTransitionUtils;
@@ -845,6 +842,29 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt
                     }
                 }
             }
+            //入库前 山能定制化新增字段赋值
+            DdtxxBO ddtxx = ddpcxxReq.getDDZXX().get(0).getDDTXX();
+            List<DdmxxxBO> ddmxxx = ddpcxxReq.getDDZXX().get(0).getDDMXXX();
+
+            for(OrderProcessInfo processInfo:insertProcessInfo){
+                processInfo.setBzdh(ddtxx.getBZDH());
+                processInfo.setXtly(ddtxx.getXTLY());
+                processInfo.setGsdm(ddtxx.getGSDM());
+                processInfo.setBhzt(ddtxx.getBHZT());
+                processInfo.setYgxm(ddtxx.getYGXM());
+                processInfo.setKppzh(ddtxx.getKPPZH());
+                processInfo.setPzgzrq(DateUtil.parse(ddtxx.getPZGZRQ(),"yyyy-MM-dd"));
+                processInfo.setYzfp(ddtxx.getYZFP());
+                processInfo.setOriginDdh(ddtxx.getDDH());
+                processInfo.setOriginOrderId(processInfo.getOrderInfoId());
+            }
+            for(OrderItemInfo itemInfo:insertOrderItem.get(0)){
+                itemInfo.setPh(ddmxxx.get(0).getPH());
+                itemInfo.setKb(ddmxxx.get(0).getKB());
+                //TODO lfl 这两在哪赋值？
+                itemInfo.setZnfm("");
+                itemInfo.setTswl("");
+            }
 
             /*
              * 手动导入判断

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

@@ -8,7 +8,10 @@ import com.dxhy.order.baseservice.module.thirdservice.simsback.service.SimsBackS
 import com.dxhy.order.constant.*;
 import com.dxhy.order.consumer.constant.InterfaceNameEnum;
 import com.dxhy.order.consumer.dao.InterfaceRequestDataMapper;
+import com.dxhy.order.consumer.dao.OrderProcessInfoMapper;
+import com.dxhy.order.consumer.modules.order.service.OrderProcessService;
 import com.dxhy.order.consumer.openapi.protocol.po.EsOutput;
+import com.dxhy.order.consumer.openapi.protocol.po.IsInput;
 import com.dxhy.order.consumer.openapi.protocol.po.PoCommonRequestParam;
 import com.dxhy.order.consumer.openapi.protocol.po.PoCommonResponseParam;
 import com.dxhy.order.consumer.openapi.protocol.v4.order.DdpcxxReqBO;
@@ -24,6 +27,7 @@ import com.dxhy.order.consumer.openapi.service.InterfaceServiceV6;
 import com.dxhy.order.invoice.config.InvoiceConfig;
 import com.dxhy.order.invoice.utils.HttpInvoiceRequestUtilQd;
 import com.dxhy.order.model.InterfaceRequestData;
+import com.dxhy.order.model.OrderProcessInfo;
 import com.dxhy.order.model.newsk.InvoiceRequestParam;
 import com.dxhy.order.utils.DecimalCalculateUtil;
 import com.dxhy.order.utils.DistributedKeyMaker;
@@ -34,9 +38,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.Date;
+import java.util.*;
-import java.util.List;
-import java.util.Objects;
 
 
 /**
@@ -65,6 +67,8 @@ public class InterfaceServiceImplV6 implements InterfaceServiceV6 {
     private InvoiceConfig invoiceConfig;
     @Resource
     private InterfaceRequestDataMapper interfaceRequestDataMapper;
+    @Resource
+    private OrderProcessInfoMapper orderProcessInfoMapper;
 
     @Override
     public DdpcxxRspV5 generateQdInvoiceV6(DdpcxxReqBO ddpcxxReq, String secretId, String kpjh) {
@@ -122,10 +126,31 @@ public class InterfaceServiceImplV6 implements InterfaceServiceV6 {
     public PoCommonResponseParam updateOrderStatus(PoCommonRequestParam requestParam, String secretId) {
         PoCommonResponseParam poCommonResponseParam = new PoCommonResponseParam();
         EsOutput esOutput = new EsOutput();
-        esOutput.setBSKEY("");
+        IsInput is_input = requestParam.getIS_INPUT();
-        esOutput.setSAPKEY("");
+        esOutput.setBSKEY(is_input.getBSKEY());
-        esOutput.setZTYPE(OrderInfoContentEnum.INVOICE_ERROR_CODE_OP_S.getKey());
+        esOutput.setSAPKEY(is_input.getSAPKEY());
-        esOutput.setZMESSAGE("");
+        String zdata = is_input.getZDATA();
+        Map map = JsonUtils.getInstance().parseObject(zdata, Map.class);
+        String ddh = (String)map.get("ZJSDH");
+        String bzdh = (String)map.get("ZBZDH");
+        Map<String,String> queryMap = new HashMap<>();
+        queryMap.put("bzdh",bzdh);
+        List<OrderProcessInfo> orderProcessInfos = orderProcessInfoMapper.queryOrderInfo(queryMap, null, null);
+        if(orderProcessInfos.size()!=1){
+            esOutput.setZTYPE(OrderInfoContentEnum.INVOICE_ERROR_CODE_OP_E.getKey());
+            esOutput.setZMESSAGE("根据报账单号未查询到唯一结算单");
+        }else {
+            OrderProcessInfo orderProcessInfo = orderProcessInfos.get(0);
+            orderProcessInfo.setBhzt(ConfigureConstant.STRING_1);
+            int i = orderProcessInfoMapper.updateOrderProcessInfoByFpqqlsh(orderProcessInfo, null);
+            if(i == 1){
+                esOutput.setZTYPE(OrderInfoContentEnum.INVOICE_ERROR_CODE_OP_S.getKey());
+                esOutput.setZMESSAGE("驳回状态更新成功");
+            }else {
+                esOutput.setZTYPE(OrderInfoContentEnum.INVOICE_ERROR_CODE_OP_E.getKey());
+                esOutput.setZMESSAGE("驳回状态更新失败");
+            }
+        }
         poCommonResponseParam.setES_OUTPUT(esOutput);
         return poCommonResponseParam;
     }

order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java

@@ -3464,14 +3464,14 @@ public class BeanTransitionUtils {
             FpkjReqSap req = JsonUtils.getInstance().parseObject(zdataString, FpkjReqSap.class);
             //批次信息
             ddpcxxBO.setDDQQPCH(isinput.getSAPKEY());
-            ddpcxxBO.setNSRSBH(deptEntity.getTaxpayerCode());
+            ddpcxxBO.setNSRSBH(deptEntity.getInvoiceNsrsbh());
             ddpcxxBO.setFPLXDM(CommonUtils.transSnFplxdm(req.getZFPLX()));
             ddpcxxBO.setKPFS(ConfigureConstant.STRING_1);
             //订单头信息
             ddtxxBO.setDDQQLSH(isinput.getSAPKEY());
             ddtxxBO.setKPLX(req.getZSFHZ());
-            ddtxxBO.setXHFSBH(deptEntity.getTaxpayerCode());
+            ddtxxBO.setXHFSBH(deptEntity.getInvoiceNsrsbh());
-            ddtxxBO.setXHFMC(deptEntity.getName());
+            ddtxxBO.setXHFMC(deptEntity.getInvoiceName());
             ddtxxBO.setXHFDZ(deptEntity.getTaxpayerAddress());
             ddtxxBO.setXHFDH(deptEntity.getTaxpayerPhone());
             ddtxxBO.setXHFYH(deptEntity.getTaxpayerBank());
@@ -3484,6 +3484,15 @@ public class BeanTransitionUtils {
             ddtxxBO.setHJJE(req.getZBHSJE());
             ddtxxBO.setHJSE(req.getZZSE());
             ddtxxBO.setDDH(req.getZJSDH());
+            ddtxxBO.setBZDH(req.getZBZDH());
+            ddtxxBO.setXTLY(req.getZSJLY());
+            ddtxxBO.setGSDM(req.getBUKRS());
+            ddtxxBO.setBHZT(ConfigureConstant.STRING_0);
+            ddtxxBO.setYGXM(req.getPENAM());
+            ddtxxBO.setKPPZH(req.getZKPPZH());
+            ddtxxBO.setPZGZRQ(req.getZGZRQ());
+            ddtxxBO.setYZFP(ConfigureConstant.STRING_0);
+            ddtxxBO.setORIGINDDH(req.getZJSDH());
             //TODO lfl 清单标志怎么处理？
             ddtxxBO.setQDBZ("0");
             //明细信息
@@ -3511,6 +3520,8 @@ public class BeanTransitionUtils {
                 ddmxxxBO.setJE(detail.getZHSJE());
                 ddmxxxBO.setHSBZ(ConfigureConstant.STRING_1);
                 ddmxxxBO.setSE(detail.getZZSE());
+                ddmxxxBO.setPH(detail.getCHARG());
+                ddmxxxBO.setKB(detail.getKTYPE());
                 //TODO lfl 优惠政策标识 取税编对应的优惠政策标识!
                 ddmxxxBO.setYHZCBS("0");
                 ddmxList.add(ddmxxxBO);

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

@@ -50,6 +50,9 @@
         <result column="kppzh" property="kppzh" jdbcType="VARCHAR"/>
         <result column="pzgzrq" property="pzgzrq" jdbcType="TIMESTAMP"/>
         <result column="yzfp" property="yzfp" jdbcType="VARCHAR"/>
+        <result column="origin_ddh" property="originDdh" jdbcType="VARCHAR"/>
+        <result column="origin_order_id" property="originOrderId" jdbcType="VARCHAR"/>
+        <result column="kb" property="kb" jdbcType="VARCHAR"/>
     </resultMap>
 
     <resultMap id="selectYwlxCountResultMap" type="com.dxhy.order.consumer.modules.order.model.bo.YwlxCountBO">
@@ -85,7 +88,7 @@
         ghf_mc, ghf_nsrsbh,
         kpxm, ddcjsj, ddlx, ddzt, ddly, ywlx,ywlx_id,kpfs, sbyy, order_status, create_time,
         update_time,xhf_nsrsbh,xhf_mc,ent_id,sksbdm,fg_status,edit_status,num,check_status,check_time,
-        bzdh,xtly,gsdm,bhzt,ygxm,kppzh,pzgzrq,yzfp
+        bzdh,xtly,gsdm,bhzt,ygxm,kppzh,pzgzrq,yzfp,origin_ddh,origin_order_id,kb
     </sql>
 
     <select id="selectOrderProcessInfoByProcessId" resultMap="BaseResultMap"
@@ -170,7 +173,7 @@
                                         sbyy, order_status, create_time,
                                         update_time, xhf_nsrsbh, xhf_mc,ent_id,sksbdm,
                                         edit_status, num, check_status, check_time,
-                                        bzdh,xtly,gsdm,bhzt,ygxm,kppzh,pzgzrq,yzfp)
+                                        bzdh,xtly,gsdm,bhzt,ygxm,kppzh,pzgzrq,yzfp,origin_ddh,origin_order_id,kb)
         values (#{id,jdbcType=VARCHAR}, #{orderInfoId,jdbcType=VARCHAR}, #{ddqqpch,jdbcType=VARCHAR},
                 #{fpqqlsh,jdbcType=VARCHAR},
                 #{ddh,jdbcType=VARCHAR}, #{tqm,jdbcType=VARCHAR}, #{kphjje,jdbcType=VARCHAR},
@@ -187,7 +190,8 @@
                 #{xhfNsrsbh,jdbcType=VARCHAR}, #{xhfMc,jdbcType=VARCHAR}, #{entId,jdbcType=VARCHAR}, #{sksbCode,jdbcType=VARCHAR},
                 #{editStatus,jdbcType=VARCHAR}, #{num,jdbcType=INTEGER}, #{checkStatus,jdbcType=VARCHAR},
                 #{checkTime,jdbcType=VARCHAR}, #{bzdh,jdbcType=VARCHAR}, #{xtly,jdbcType=VARCHAR}, #{gsdm,jdbcType=VARCHAR},
-                #{bhzt,jdbcType=VARCHAR}, #{ygxm,jdbcType=VARCHAR}, #{kppzh,jdbcType=VARCHAR}, #{pzgzrq,jdbcType=TIMESTAMP}, #{yzfp,jdbcType=VARCHAR})
+                #{bhzt,jdbcType=VARCHAR}, #{ygxm,jdbcType=VARCHAR}, #{kppzh,jdbcType=VARCHAR}, #{pzgzrq,jdbcType=TIMESTAMP},
+                #{yzfp,jdbcType=VARCHAR}, #{originDdh,jdbcType=VARCHAR}, #{originOrderId,jdbcType=VARCHAR}, #{kb,jdbcType=VARCHAR})
     </insert>
 
     <update id="updateOrderProcessInfoByProcessId" parameterType="com.dxhy.order.model.OrderProcessInfo">
@@ -307,6 +311,15 @@
             <if test="processInfo.yzfp != null">
                 yzfp = #{processInfo.yzfp,jdbcType=VARCHAR},
             </if>
+            <if test="processInfo.originDdh != null">
+                origin_ddh = #{processInfo.originDdh,jdbcType=VARCHAR},
+            </if>
+            <if test="processInfo.originOrderId != null">
+                origin_order_id = #{processInfo.originOrderId,jdbcType=VARCHAR},
+            </if>
+            <if test="processInfo.kb != null">
+                kb = #{processInfo.kb,jdbcType=VARCHAR},
+            </if>
         </set>
         <where>
             <if test="processInfo.id != null and processInfo.id != '' ">
@@ -350,7 +363,7 @@
         op.ghf_mc, op.ghf_nsrsbh,
         op.kpxm, op.ddcjsj, op.ddlx, op.ddzt, op.ddly, op.ywlx,op.ywlx_id,op.kpfs, op.sbyy, op.order_status, op.create_time,
         op.update_time,op.xhf_nsrsbh,op.ent_id,op.xhf_mc,op.fg_status,op.edit_status,num,op.check_status,op.check_time,
-        op.bzdh,op.xtly,op.gsdm,op.bhzt,op.ygxm,op.kppzh,op.pzgzrq,op.yzfp
+        op.bzdh,op.xtly,op.gsdm,op.bhzt,op.ygxm,op.kppzh,op.pzgzrq,op.yzfp,op.origin_ddh,op.origin_order_id,op.kb
         from order_process_info op
         left join order_invoice_info oii on op.id = oii.order_process_info_id
 
@@ -562,19 +575,6 @@
                     #{item}
                 </foreach> or op.ent_id is null)
             </if>
-
-            <!-- 异常订单列表根据订单更新时间排序 -->
-            <choose>
-                <when test="map.orderBy !=null and map.orderBy == 'updateTime' ">
-                    order by op.update_time desc
-                </when>
-                <when test="map.orderBy !=null and map.orderBy == 'createTimeAsc' ">
-                    order by op.ddcjsj asc
-                </when>
-                <otherwise>
-                    order by op.ddcjsj desc,op.num desc,op.create_time desc,op.id desc
-                </otherwise>
-            </choose>
             <if test="map.bzdh != null and map.bzdh != ''">
                 and op.bzdh = #{map.bzdh,jdbcType=VARCHAR}
             </if>
@@ -599,6 +599,29 @@
             <if test="map.yzfp != null and map.yzfp != ''">
                 and op.yzfp = #{map.yzfp,jdbcType=VARCHAR}
             </if>
+            <if test="map.originDdh != null and map.originDdh != ''">
+                and op.origin_ddh = #{map.originDdh,jdbcType=VARCHAR}
+            </if>
+            <if test="map.originOrderId != null and map.originOrderId != ''">
+                and op.origin_order_id = #{map.originOrderId,jdbcType=VARCHAR}
+            </if>
+            <if test="map.kb != null and map.kb != ''">
+                and op.kb = #{map.kb,jdbcType=VARCHAR}
+            </if>
+
+            <!-- 异常订单列表根据订单更新时间排序 -->
+            <choose>
+                <when test="map.orderBy !=null and map.orderBy == 'updateTime' ">
+                    order by op.update_time desc
+                </when>
+                <when test="map.orderBy !=null and map.orderBy == 'createTimeAsc' ">
+                    order by op.ddcjsj asc
+                </when>
+                <otherwise>
+                    order by op.ddcjsj desc,op.num desc,op.create_time desc,op.id desc
+                </otherwise>
+            </choose>
+
         </where>
     </select>
 
@@ -853,6 +876,15 @@
             <if test="processInfo.yzfp != null">
                 yzfp = #{processInfo.yzfp,jdbcType=VARCHAR},
             </if>
+            <if test="processInfo.originDdh != null">
+                origin_ddh = #{processInfo.originDdh,jdbcType=VARCHAR},
+            </if>
+            <if test="processInfo.originOrderId != null">
+                origin_order_id = #{processInfo.originOrderId,jdbcType=VARCHAR},
+            </if>
+            <if test="processInfo.kb != null">
+                kb = #{processInfo.kb,jdbcType=VARCHAR},
+            </if>
         </set>
         <where>
             <if test="processInfo.id != null and processInfo.id != '' ">