fix

data-base/base-sync-oms-order/src/main/java/com/bailuntec/domain/pojo/OmsResult.java

@@ -321,7 +321,8 @@ public class OmsResult {
     @JSONField(name = "isTransferOrder")
     private Boolean hasTransferOrder;
 
-
+    @JSONField(name = "rmaStatus")
+    private String rmaStatus;
     /**
      * 实际最后发货时间
      */

data-base/base-sync-oms-order/src/main/java/com/bailuntec/job/OrderSyncJob.java

@@ -527,11 +527,19 @@ public class OrderSyncJob extends PointJob {
                         if (dcBaseOmsOrder.getBuyerName() == null) {
                             dcBaseOmsOrder.setBuyerName("无");
                         }
+                        //kuozhanbiao
+                        List<DcBaseOmsOrderExt> exts = dcBaseOmsOrder.getExt();
+                        exts.forEach(x ->{
+                            x.setBailunAccountId(dcBaseOmsOrder.getBailunAccountId());
+                            x.setOriginOrderId(dcBaseOmsOrder.getOriginOrderId());
+                        });
                         DcBaseOmsOrderMapper omsOrderMapper = SessionUtil.getSession().getMapper(DcBaseOmsOrderMapper.class);
                         int i = omsOrderMapper.updateByExampleSelective(dcBaseOmsOrder, DcBaseOmsOrderExample.newAndCreateCriteria().andOriginOrderIdEqualTo(dcBaseOmsOrder.getOriginOrderId()).andBailunAccountIdEqualTo(dcBaseOmsOrder.getBailunAccountId()).example());
                         if (i == 0) {
                             omsOrderMapper.insertSelective(dcBaseOmsOrder);
                         }
+                        DcBaseOmsOrderExtMapper omsOrderExtMapper = SessionUtil.getSession().getMapper(DcBaseOmsOrderExtMapper.class);
+                        omsOrderExtMapper.upsertList(exts);
                         /**
                          * 这里存平台维度的东西到表里
                          * 留作他用, 不参与计算
@@ -1271,8 +1279,10 @@ public class OrderSyncJob extends PointJob {
         dcBaseOmsOrder.setAmountRefund(BigDecimal.ZERO);
         //销售额 - 需要计算的费用给个默认值
         dcBaseOmsOrder.setAmountSales(BigDecimal.ZERO);
-        //
+        //最后发货时间(真实)
         dcBaseOmsOrder.setShippingDeadlineReal(omsResult.getShippingDeadlineReal());
+        //RMA状态
+        dcBaseOmsOrder.setRmaStatus(omsResult.getRmaStatus());
     }
 
     /**

data-common/src/main/java/com/bailuntec/annotation/TableExt.java

+package com.bailuntec.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * @Author: li.yanlin
+ * @Description： 扩展表key value 赋值，扩展表必须存在key value 字段
+ * @Date: Created in
+ * @Modified by:
+ */
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface TableExt {
+    public Class clazz();
+
+    public String key() default "";
+}

data-common/src/main/java/com/bailuntec/domain/entity/DcBaseOmsOrderExt.java

+package com.bailuntec.domain.entity;
+
+import com.bailuntec.domain.pojo.TableExtBase;
+import lombok.Data;
+
+/**
+ * @Author: li.yanlin
+ * @Description：
+ * @Date: Created in
+ * @Modified by:
+ */
+@Data
+public class DcBaseOmsOrderExt extends TableExtBase {
+
+    private Integer id;
+
+    private String originOrderId;
+
+    private Integer bailunAccountId;
+}

data-common/src/main/java/com/bailuntec/domain/pojo/TableExtBase.java

+package com.bailuntec.domain.pojo;
+
+import lombok.Data;
+
+/**
+ * @Author: li.yanlin
+ * @Description：
+ * @Date: Created in
+ * @Modified by:
+ */
+@Data
+public class TableExtBase {
+    private String key;
+
+    private String value;
+}

data-common/src/main/java/com/bailuntec/mapper/DcBaseOmsOrderExtMapper.java

+package com.bailuntec.mapper;
+
+import com.bailuntec.domain.entity.DcBaseOmsOrderExt;
+import com.bailuntec.domain.entity.DcBaseSkuMapping;
+import com.bailuntec.domain.example.DcBaseSkuMappingExample;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author: li.yanlin
+ * @Description：
+ * @Date: Created in
+ * @Modified by:
+ */
+public interface DcBaseOmsOrderExtMapper {
+
+    void upsertList(@Param("list") List<DcBaseOmsOrderExt> list);
+}

data-common/src/main/java/com/bailuntec/mapper/DcBaseOmsOrderExtMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.bailuntec.mapper.DcBaseOmsOrderExtMapper">
+    <resultMap id="BaseResultMap" type="com.bailuntec.domain.entity.DcBaseOmsOrderExt">
+        <!--
+          WARNING - @mbg.generated
+          This element is automatically generated by MyBatis Generator, do not modify.
+        -->
+        <id column="id" jdbcType="INTEGER" property="id" />
+        <result column="origin_order_id" jdbcType="VARCHAR" property="originOrderId" />
+        <result column="bailun_account_id" jdbcType="INTEGER" property="bailunAccountId" />
+        <result column="key" jdbcType="VARCHAR" property="key" />
+        <result column="value" jdbcType="VARCHAR" property="value" />
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        <!--
+          WARNING - @mbg.generated
+          This element is automatically generated by MyBatis Generator, do not modify.
+        -->
+        id, origin_order_id, bailun_account_id, `key`, value
+    </sql>
+    <insert id="upsertList" parameterType="com.bailuntec.domain.entity.DcBaseOmsOrderExt">
+        insert into dc_base_oms_order_ext (id,origin_order_id,bailun_account_id,`key`,value) values
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+        #{item.id},#{item.originOrderId},#{item.bailunAccountId},#{item.key},#{item.value}
+        </foreach>
+        on duplicate key update
+        value = values(value)
+    </insert>
+</mapper>
\ No newline at end of file

data-common/src/main/java/com/bailuntec/mapper/DcBasePurchaseMapper.xml

@@ -906,7 +906,7 @@
             tb1.bailun_sku AS bailun_sku,
             tb1.warehouse_code AS warehouse_code,
             tb1.purchase_id AS purchase_id,
-            tb1.estimated_arrival_time AS estimated_arrival_time,
+            tb1.estimated_arrival_time_aims AS estimated_arrival_time,
             tb1.has_transfer AS has_transfer,
             sum( ( tb1.count - IFNULL( tb2.count, 0 ) ) ) AS count
         FROM
@@ -916,7 +916,7 @@
                 warehouse_code,
                 parent_id,
                 purchase_id,
-                estimated_arrival_time,
+                estimated_arrival_time_aims,
                 has_transfer,
                 sum( count ) AS count
             FROM

data-common/src/main/java/com/bailuntec/utils/TableExtUtil.java

+package com.bailuntec.utils;
+
+import com.bailuntec.annotation.TableExt;
+import com.bailuntec.domain.entity.DcBaseOmsOrder;
+import com.bailuntec.domain.entity.DcBaseOmsOrderExt;
+import com.bailuntec.domain.pojo.TableExtBase;
+
+import java.lang.reflect.*;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author: li.yanlin
+ * @Description：
+ * @Date: Created in
+ * @Modified by:
+ */
+public class TableExtUtil<T extends TableExtBase,S>  {
+
+    public List<T> setTargetTable (Class<T> targetClass, S source) throws IllegalAccessException, InstantiationException {
+        List<T> targets = new ArrayList<T>();
+        Field[] fields = source.getClass().getDeclaredFields();
+        for (Field field : fields) {
+            TableExt tableExt = field.getAnnotation(TableExt.class);
+            if(tableExt != null){
+                T ext = targetClass.newInstance();
+                String key = tableExt.key();
+                if(key == null || key.isEmpty()){
+                    key = field.getName();
+                }
+                String value = "";
+                try {
+                    field.setAccessible(true);
+                    value = field.get(source).toString();
+                } catch (IllegalAccessException e) {
+                    e.printStackTrace();
+                }
+                ext.setKey(key);
+                ext.setValue(value);
+                targets.add(ext);
+            }
+        }
+        return targets;
+    }
+}

data-finance/finance-balance-sheet/src/main/java/com/bailuntec/balancesheet/mapper/DcBalanceSheetMapper.java

@@ -152,7 +152,7 @@ public interface DcBalanceSheetMapper {
     @Select({"select finished_accounts_payable from dc_balance_sheet where statistical_time = #{date}"})
     BigDecimal getLogisticsAccountsPayableSum(@Param("date") Date date);
 
-    @Select("select finished_accounts_payable from dc_balance_sheet where statistical_time <= #{lastDay} and finished_accounts_payable > 0 order by finished_accounts_payable desc limit 1 ")
+    @Select("select finished_accounts_payable from dc_balance_sheet where statistical_time <= #{date} and finished_accounts_payable > 0 order by finished_accounts_payable desc limit 1 ")
     BigDecimal getLogisticsAccountsPayableSumByOld(@Param("date") Date date);
 
     @Select("select sum((amount - ifnull(had_pay, 0) + ifnull(compensate, 0)) * to_rmb_rate) from dc_daily_fee where recoed_time = #{lastDay} and company_value not in (78,72,71,67,58,54)")

data-finance/finance-balance-sheet/src/main/java/com/bailuntec/balancesheet/mapper/DcBaseCostMapper.java

@@ -12,7 +12,7 @@ import java.util.List;
 public interface DcBaseCostMapper {
 
     @Insert("<script>" +
-            "insert into dc_base_cost(cost_no,company_no,company_name,type_no,type_name,subject_code,kind_no,kind_name,create_usercode,create_username,cost_remark," +
+            "insert ignore into dc_base_cost(cost_no,company_no,company_name,type_no,type_name,subject_code,kind_no,kind_name,create_usercode,create_username,cost_remark," +
             "create_time,son_cost_no,sup_cost_no,cost_status,file_path,mor_file_path,amount,create_userid,sub_logistics_supplier_id,logistics_supplier_id," +
             "bank_name,bank_card,bank_card_user,mor_remark,cost_form,cost_reason,is_lend,had_pay,lend_status,compensate,counteract,lend_balance,reject_reason," +
             "bank_company,cost_plan_no,dic,pay_counteract,pay_lend_balance,pay_plan_amount,pay_dic,pay_cur,is_tax,detail_key,pay_user_id,pay_time,amount_rmb,to_rmb_rate," +

data-finance/finance-balance-sheet/src/main/java/com/bailuntec/balancesheet/mapper/DcSemiDailyTransferMapper.java

@@ -11,7 +11,7 @@ import java.util.Date;
 @Repository
 public interface DcSemiDailyTransferMapper {
     @Insert("<script>" +
-            "insert into dc_semi_daily_transfer(day,buy_id,detail_id,buy_no,supplier_id,supplier_name,sku_code,sku_name,warehouse_id,warehouse_name,transfer_quantity,unit_price,semi_update_date) " +
+            "insert ignore into dc_semi_daily_transfer(day,buy_id,detail_id,buy_no,supplier_id,supplier_name,sku_code,sku_name,warehouse_id,warehouse_name,transfer_quantity,unit_price,semi_update_date) " +
             "select #{lastDay},buy_id,detail_id,buy_no,supplier_id,supplier_name,sku_code,sku_name,warehouse_id,warehouse_name,transfer_quantity,unit_price,semi_update_date " +
             "from dc_semi_purchase_detail where transfer_quantity > 0 and sku_del_status=0 and purchase_del_status=0" +
             "</script>")