Merge branch 'dev-snyx' into test

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

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

@@ -1452,7 +1452,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
                 fpkjtsReqSap.setZHSJEY(ddfpxx.getJSHJ());
                 fpkjtsReqSap.setZHSJE(ddfpxx.getJSHJ());
                 fpkjtsReqSap.setZZBZ(ddfpxx.getBZ());
-                fpkjtsReqSap.setZFPZT(ConfigureConstant.STRING_0);//0-正常、1-作废
+                fpkjtsReqSap.setZFPZT(ddfpxx.getZFBZ());//0-正常、1-作废
                 String formatKprq = "";
                 try {
                     Date date = (Date) new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(ddfpxx.getKPRQ());
@@ -1481,6 +1481,14 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
                 fpkjtsReqSap.setZYWDJ(ddfpxx.getBillNum());
                 fpkjtsReqSap.setIMGID(ddfpxx.getDocuId());
                 fpkjtsReqSap.setZBZDH(ddfpxx.getBillNum());
+//                String zfbz = ddfpxx.getZFBZ();
+//                String chbz = ddfpxx.getCHBZ();
+//                fpkjtsReqSap.setZFPZT();
+                if(StringUtils.isNotBlank(ddfpxx.getYFPHM())){
+                    fpkjtsReqSap.setZYFPDM(ddfpxx.getYFPDM());
+                    fpkjtsReqSap.setZYFPHM(ddfpxx.getYFPHM());
+                    fpkjtsReqSap.setZHZXXB(StringUtils.isNotBlank(ddfpxx.getHZXXBBH())?ddfpxx.getHZXXBBH():"");
+                }
                 if(OrderInfoEnum.SYS_SOURCE_DSXT01.getKey().equals(ddfpxx.getXtly()) ||
                         OrderInfoEnum.SYS_SOURCE_DSXT02.getKey().equals(ddfpxx.getXtly())){
                     fpkjtsReqSap.setPDFZJL(ddfpxx.getPDFZJL());

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

@@ -17,10 +17,7 @@ import com.dxhy.order.baseservice.openapi.protocol.qd.PageXfxx;
 import com.dxhy.order.baseservice.openapi.protocol.spxx.SpxxBO;
 import com.dxhy.order.baseservice.openapi.protocol.spxx.SpxxtbReqBO;
 import com.dxhy.order.baseservice.utils.BaseServiceBeanTransitionUtils;
-import com.dxhy.order.constant.ConfigureConstant;
+import com.dxhy.order.constant.*;
-import com.dxhy.order.constant.ConfigurerInfo;
-import com.dxhy.order.constant.OrderInfoContentEnum;
-import com.dxhy.order.constant.OrderInfoEnum;
 import com.dxhy.order.consumer.openapi.protocol.Response;
 import com.dxhy.order.consumer.openapi.protocol.cpy.*;
 import com.dxhy.order.consumer.openapi.protocol.invoice.DeprecateInvoicesRspBO;
@@ -3697,13 +3694,6 @@ public class BeanTransitionUtils {
         return ddpcxxReqBO;
     }
 
-    public static void main(String[] args) {
-       String reqStr = "{\"IS_INPUT\":{\"SYSID\":\"S4\",\"IFYWID\":\"FI883\",\"BSKEY\":\" JS221122110412000031\",\"SAPKEY\":\"GXA3802307200005\",\"ZFILED5\":300,\"ZDATA\":\"{\\\"ZBZDH\\\":\\\"GXA3802307200005\\\",\\\"ZJSDH\\\":\\\" JS221122110412000031\\\",\\\"ZSNYX\\\":\\\"X\\\",\\\"ZKPLX\\\":\\\"\\\",\\\"ZFPLX\\\":\\\"10\\\",\\\"BUKRS\\\":\\\"A380\\\",\\\"ZGFBH\\\":\\\"0000609000\\\",\\\"ZBHSJE\\\":0,\\\"ZZSE\\\":0,\\\"ZHSJE\\\":0,\\\"ZZBZ\\\":\\\"\\\",\\\"ZSKRXM\\\":\\\"\\\",\\\"ZFHRXM\\\":\\\"\\\",\\\"ZKPRXM\\\":\\\"\\\",\\\"ZSFHZ\\\":\\\"0\\\",\\\"PENAM\\\":\\\"\\\",\\\"ZKPPZH\\\":\\\"\\\",\\\"ZGZRQ\\\":\\\"0000-00-00\\\",\\\"IT_ITEM\\\":[{\\\"ZBZDH\\\":\\\"GXA3802307200005\\\",\\\"ZBZDHH\\\":0,\\\"ZSFZKH\\\":\\\"1\\\",\\\"MATNR\\\":\\\"836408369879195648\\\",\\\"ZSLDW\\\":\\\"\\\",\\\"ZZSL\\\":0,\\\"ZTAX\\\":6.00,\\\"ZZDJ\\\":0,\\\"ZBHSJE\\\":124.53,\\\"ZZSE\\\":7.47,\\\"ZHSJE\\\":132.00,\\\"ZCPMC\\\":\\\"\\\",\\\"CHARG\\\":\\\"\\\",\\\"KTYPE\\\":\\\"\\\"},{\\\"ZBZDH\\\":\\\"GXA3802307200005\\\",\\\"ZBZDHH\\\":0,\\\"ZSFZKH\\\":\\\"1\\\",\\\"MATNR\\\":\\\"836408252287688704\\\",\\\"ZSLDW\\\":\\\"\\\",\\\"ZZSL\\\":0,\\\"ZTAX\\\":6.00,\\\"ZZDJ\\\":0,\\\"ZBHSJE\\\":22.64,\\\"ZZSE\\\":1.36,\\\"ZHSJE\\\":24.00,\\\"ZCPMC\\\":\\\"\\\",\\\"CHARG\\\":\\\"\\\",\\\"KTYPE\\\":\\\"\\\"}]}\"}}";
-        PoCommonRequestParam poCommonRequestParam = JSONObject.parseObject(reqStr, PoCommonRequestParam.class);
-        DdpcxxReqBO ddpcxxReqBO = BeanTransitionUtils.transitionPoKpReq(poCommonRequestParam, new DeptEntity());
-        System.out.println(ddpcxxReqBO);
-    }
-
     /**
      * @Description: 将标准开票响应参数转换成PO接口开票响应参数
      * @Param: [ddpcxxRspV5]

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

@@ -111,9 +111,9 @@ public class BeanTransitionV5Utils {
         ddfpxxV5.setDDH(orderInfo.getDdh());
         ddfpxxV5.setDDSJ(DateUtil.formatDateTime(orderInfo.getDdrq()));
         //初始化为未作废
-        ddfpxxV5.setZFBZ(OrderInfoEnum.INVALID_INVOICE_0.getKey());
+        ddfpxxV5.setZFBZ(orderInvoiceInfo.getZfBz());
         //初始化为未冲红
-        ddfpxxV5.setCHBZ(OrderInfoEnum.INTERFACE_RED_INVOICE_0.getKey());
+        ddfpxxV5.setCHBZ(orderInvoiceInfo.getChBz());
 
         // TODO: 2018/9/21 后期考虑添加订单类型和订单状态等数据.
         if (ObjectUtil.isNotNull(orderInvoiceInfo)) {

order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OrderInvoiceInfoServiceImpl.java

@@ -1097,6 +1097,7 @@ public class OrderInvoiceInfoServiceImpl implements OrderInvoiceInfoService {
 
                     //开票成功后并且是红票需要更新对应蓝票状态,冲红标志和剩余可冲红金额
                     if (hzfp) {
+                        //全电冲红后修改蓝字的冲红标志
                         dealRedInvoice(orderInvoiceInfo.getFpqqlsh(), rabbitMqCommonInvoice.getKpzt(), shList);
                     }