新增对OMS退款字段的解析, 退款只存而不参与计算

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

@@ -327,4 +327,14 @@ public class OmsResult {
     @JSONField(name = "tenantId")
     private Integer companyId;
 
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_order.area_id
+     *
+     * @mbg.generated
+     */
+    @JSONField(name = "refund")
+    private RefundInfo refundInfo;
+
 }

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

+package com.bailuntec.domain.pojo;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class RefundInfo {
+
+    private String refundStatus;
+    private Currency refundAmount;
+    @JSONField(name = "lastRefundTime")
+    private LocalDateTime refundTime;
+    @JSONField(name = "refundTo")
+    private String refundObj;
+    private String refundType;
+    @JSONField(name = "referenceID")
+    private String refundReferenceId;
+
+}

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

@@ -270,6 +270,8 @@ public class OrderSyncJob extends PointJob {
                             dcBaseOmsSku.setRatioWeight(bailunSkuStructure.getSkuWeightRatio());
                             //总收入
                             BigDecimal skuAmountTotal = bailunSkuStructure.getSkuCostRatio().multiply(dcBaseOmsOrder.getAmountTotal()).setScale(3, RoundingMode.HALF_EVEN);
+                            //退款
+                            BigDecimal skuAmountRefund = bailunSkuStructure.getSkuCostRatio().multiply(dcBaseOmsOrder.getAmountRefund()).setScale(3, RoundingMode.HALF_EVEN);
                             //商品收入
                             BigDecimal skuAmountProduct = bailunSkuStructure.getSkuCostRatio().multiply(dcBaseOmsOrder.getAmountProduct()).setScale(3, RoundingMode.HALF_EVEN);
                             //礼品包装收入
@@ -346,6 +348,7 @@ public class OrderSyncJob extends PointJob {
                                 dcBaseOmsSku.setCostPromotion(skuCostPromotion.divide(quantityOrderdDecimal, 3, RoundingMode.HALF_EVEN));
                                 dcBaseOmsSku.setAmountSales(skuAmountSales.subtract(skuCostPromotion).divide(quantityOrderdDecimal, 3, RoundingMode.HALF_EVEN));
                                 dcBaseOmsSku.setAmountShipping(skuAmountShipping.divide(quantityOrderdDecimal, 3, RoundingMode.HALF_EVEN));
+                                dcBaseOmsSku.setAmountRefund(skuAmountRefund.divide(quantityOrderdDecimal, 3, RoundingMode.HALF_EVEN));
                                 //单个SKU的销售额
                                 unitSkuAmountSalesRMB = skuAmountSalesRMB.divide(quantityOrderdDecimal, 3, RoundingMode.HALF_EVEN);
                                 //单个SKU的支出
@@ -562,9 +565,8 @@ public class OrderSyncJob extends PointJob {
             DcBaseOmsOrderMapper mapper = SessionUtil.getSession().getMapper(DcBaseOmsOrderMapper.class);
             mapper.logicDeleteOmsSku(dcBaseOmsOrder);
             mapper.logicDeleteOmsPick(dcBaseOmsOrder);
-            DcBaseCrmRefundMapper crmRefundMapper = SessionUtil.getSession().getMapper(DcBaseCrmRefundMapper.class);
-            crmRefundMapper.updateLinked(dcBaseOmsOrder.getOriginOrderId(), dcBaseOmsOrder.getBailunAccountId());
-            dcBaseOmsOrder.setAmountRefund(BigDecimal.ZERO);
+//            DcBaseCrmRefundMapper crmRefundMapper = SessionUtil.getSession().getMapper(DcBaseCrmRefundMapper.class);
+//            crmRefundMapper.updateLinked(dcBaseOmsOrder.getOriginOrderId(), dcBaseOmsOrder.getBailunAccountId());
         } catch (Exception e) {
             throw new RuntimeException("Mybatis操作DB失败", e);
         } finally {
@@ -907,6 +909,7 @@ public class OrderSyncJob extends PointJob {
             dcBaseOmsOrder.setPayStatus(omsResult.getPayment().getPayStatus());
             dcBaseOmsOrder.setCollectionAccount(omsResult.getPayment().getCollectionAccount());
         }
+
         dcBaseOmsOrder.setTransactionId(omsResult.getTransactionId());
         dcBaseOmsOrder.setOriginOrderId(omsResult.getOriginOrderId());
         dcBaseOmsOrder.setBailunOrderId(omsResult.getBailunOrderId());
@@ -938,7 +941,17 @@ public class OrderSyncJob extends PointJob {
         dcBaseOmsOrder.setCostHandlePlatform(BigDecimal.ZERO);
         dcBaseOmsOrder.setCostTail(BigDecimal.ZERO);
         dcBaseOmsOrder.setCostFirst(BigDecimal.ZERO);
-
+        dcBaseOmsOrder.setAmountRefund(BigDecimal.ZERO);
+        if (omsResult.getRefundInfo() !=null) {
+            dcBaseOmsOrder.setRefundTime(omsResult.getRefundInfo().getRefundTime());
+            dcBaseOmsOrder.setBailunRefundStatus(omsResult.getRefundInfo().getRefundStatus());
+            dcBaseOmsOrder.setRefundObj(omsResult.getRefundInfo().getRefundObj());
+            dcBaseOmsOrder.setRefundReferenceId(omsResult.getRefundInfo().getRefundReferenceId());
+            dcBaseOmsOrder.setRefundType(omsResult.getRefundInfo().getRefundType());
+            if (omsResult.getRefundInfo().getRefundAmount() != null) {
+                dcBaseOmsOrder.setAmountRefund(omsResult.getRefundInfo().getRefundAmount().getAmount() != null? omsResult.getRefundInfo().getRefundAmount().getAmount() : BigDecimal.ZERO);
+            }
+        }
     }
 
     /**
@@ -1050,6 +1063,13 @@ public class OrderSyncJob extends PointJob {
         //如果是 FBA订单1.检查FBA费用是否异常 2.
         dcBaseOmsSku.setBailunSkuQuantityShipped(0);
 
+        dcBaseOmsSku.setBailunRefundStatus(dcBaseOmsOrder.getBailunRefundStatus());
+        dcBaseOmsSku.setRefundTime(dcBaseOmsOrder.getRefundTime());
+        dcBaseOmsSku.setRefundObj(dcBaseOmsOrder.getRefundObj());
+        dcBaseOmsSku.setRefundReferenceId(dcBaseOmsOrder.getRefundReferenceId());
+        dcBaseOmsSku.setAmountRefund(dcBaseOmsOrder.getAmountRefund());
+        dcBaseOmsSku.setRefundType(dcBaseOmsOrder.getRefundType());
+
     }
 
     /**

data-base/base-sync-oms-order/src/test/java/OmsOrderTest.java

@@ -73,7 +73,7 @@ public class OmsOrderTest {
         LinkedHashMap<String, String> map = new LinkedHashMap<>(4);
         map.put("pageIndex", "1");
         map.put("pageCount", "100");
-        map.put("OriginOrderNo", "402-2410782-3862701");
+        map.put("OriginOrderNo", "123761401225-2120745544002");
         Request request = new Request.Builder()
                 .get()
                 .url(OkHttpUtil.attachHttpGetParams("http://oms.bailuntec.com/apiV2/bailunOrder/getBailunOrders", map))

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

@@ -262,6 +262,15 @@ public class DcBaseOmsOrder {
     /**
      *
      * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_order.bailun_refund_status
+     *
+     * @mbg.generated
+     */
+    private String bailunRefundStatus;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
      * This field corresponds to the database column dc_base_oms_order.seller_order_exchange_rate
      *
      * @mbg.generated
@@ -818,6 +827,33 @@ public class DcBaseOmsOrder {
     private BigDecimal profitOms;
 
     /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_order.refund_obj
+     *
+     * @mbg.generated
+     */
+    private String refundObj;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_order.refund_type
+     *
+     * @mbg.generated
+     */
+    private String refundType;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_order.refund_reference_id
+     *
+     * @mbg.generated
+     */
+    private String refundReferenceId;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table dc_base_oms_order
      *
@@ -857,6 +893,7 @@ public class DcBaseOmsOrder {
         sb.append(", bailunMergeStatus=").append(bailunMergeStatus);
         sb.append(", bailunInterceptionStatus=").append(bailunInterceptionStatus);
         sb.append(", bailunShippingStatus=").append(bailunShippingStatus);
+        sb.append(", bailunRefundStatus=").append(bailunRefundStatus);
         sb.append(", sellerOrderExchangeRate=").append(sellerOrderExchangeRate);
         sb.append(", sellerOtherExchangeRate=").append(sellerOtherExchangeRate);
         sb.append(", financeOrderExchangeRate=").append(financeOrderExchangeRate);
@@ -919,6 +956,9 @@ public class DcBaseOmsOrder {
         sb.append(", hasInnersale=").append(hasInnersale);
         sb.append(", companyId=").append(companyId);
         sb.append(", profitOms=").append(profitOms);
+        sb.append(", refundObj=").append(refundObj);
+        sb.append(", refundType=").append(refundType);
+        sb.append(", refundReferenceId=").append(refundReferenceId);
         sb.append("]");
         return sb.toString();
     }
@@ -969,6 +1009,7 @@ public class DcBaseOmsOrder {
             && (this.getBailunMergeStatus() == null ? other.getBailunMergeStatus() == null : this.getBailunMergeStatus().equals(other.getBailunMergeStatus()))
             && (this.getBailunInterceptionStatus() == null ? other.getBailunInterceptionStatus() == null : this.getBailunInterceptionStatus().equals(other.getBailunInterceptionStatus()))
             && (this.getBailunShippingStatus() == null ? other.getBailunShippingStatus() == null : this.getBailunShippingStatus().equals(other.getBailunShippingStatus()))
+            && (this.getBailunRefundStatus() == null ? other.getBailunRefundStatus() == null : this.getBailunRefundStatus().equals(other.getBailunRefundStatus()))
             && (this.getSellerOrderExchangeRate() == null ? other.getSellerOrderExchangeRate() == null : this.getSellerOrderExchangeRate().equals(other.getSellerOrderExchangeRate()))
             && (this.getSellerOtherExchangeRate() == null ? other.getSellerOtherExchangeRate() == null : this.getSellerOtherExchangeRate().equals(other.getSellerOtherExchangeRate()))
             && (this.getFinanceOrderExchangeRate() == null ? other.getFinanceOrderExchangeRate() == null : this.getFinanceOrderExchangeRate().equals(other.getFinanceOrderExchangeRate()))
@@ -1030,7 +1071,10 @@ public class DcBaseOmsOrder {
             && (this.getHasScalp() == null ? other.getHasScalp() == null : this.getHasScalp().equals(other.getHasScalp()))
             && (this.getHasInnersale() == null ? other.getHasInnersale() == null : this.getHasInnersale().equals(other.getHasInnersale()))
             && (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId()))
-            && (this.getProfitOms() == null ? other.getProfitOms() == null : this.getProfitOms().equals(other.getProfitOms()));
+            && (this.getProfitOms() == null ? other.getProfitOms() == null : this.getProfitOms().equals(other.getProfitOms()))
+            && (this.getRefundObj() == null ? other.getRefundObj() == null : this.getRefundObj().equals(other.getRefundObj()))
+            && (this.getRefundType() == null ? other.getRefundType() == null : this.getRefundType().equals(other.getRefundType()))
+            && (this.getRefundReferenceId() == null ? other.getRefundReferenceId() == null : this.getRefundReferenceId().equals(other.getRefundReferenceId()));
     }
 
     /**
@@ -1071,6 +1115,7 @@ public class DcBaseOmsOrder {
         result = prime * result + ((getBailunMergeStatus() == null) ? 0 : getBailunMergeStatus().hashCode());
         result = prime * result + ((getBailunInterceptionStatus() == null) ? 0 : getBailunInterceptionStatus().hashCode());
         result = prime * result + ((getBailunShippingStatus() == null) ? 0 : getBailunShippingStatus().hashCode());
+        result = prime * result + ((getBailunRefundStatus() == null) ? 0 : getBailunRefundStatus().hashCode());
         result = prime * result + ((getSellerOrderExchangeRate() == null) ? 0 : getSellerOrderExchangeRate().hashCode());
         result = prime * result + ((getSellerOtherExchangeRate() == null) ? 0 : getSellerOtherExchangeRate().hashCode());
         result = prime * result + ((getFinanceOrderExchangeRate() == null) ? 0 : getFinanceOrderExchangeRate().hashCode());
@@ -1133,6 +1178,9 @@ public class DcBaseOmsOrder {
         result = prime * result + ((getHasInnersale() == null) ? 0 : getHasInnersale().hashCode());
         result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode());
         result = prime * result + ((getProfitOms() == null) ? 0 : getProfitOms().hashCode());
+        result = prime * result + ((getRefundObj() == null) ? 0 : getRefundObj().hashCode());
+        result = prime * result + ((getRefundType() == null) ? 0 : getRefundType().hashCode());
+        result = prime * result + ((getRefundReferenceId() == null) ? 0 : getRefundReferenceId().hashCode());
         return result;
     }
 }
\ No newline at end of file

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

@@ -944,6 +944,42 @@ public class DcBaseOmsSku {
     private Integer companyId;
 
     /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_sku.bailun_refund_status
+     *
+     * @mbg.generated
+     */
+    private String bailunRefundStatus;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_sku.refund_obj
+     *
+     * @mbg.generated
+     */
+    private String refundObj;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_sku.refund_type
+     *
+     * @mbg.generated
+     */
+    private String refundType;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_oms_sku.refund_reference_id
+     *
+     * @mbg.generated
+     */
+    private String refundReferenceId;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table dc_base_oms_sku
      *
@@ -1059,6 +1095,10 @@ public class DcBaseOmsSku {
         sb.append(", logisticsMethodName=").append(logisticsMethodName);
         sb.append(", hasInnersale=").append(hasInnersale);
         sb.append(", companyId=").append(companyId);
+        sb.append(", bailunRefundStatus=").append(bailunRefundStatus);
+        sb.append(", refundObj=").append(refundObj);
+        sb.append(", refundType=").append(refundType);
+        sb.append(", refundReferenceId=").append(refundReferenceId);
         sb.append("]");
         return sb.toString();
     }
@@ -1184,7 +1224,11 @@ public class DcBaseOmsSku {
             && (this.getLogisticsMethodCode() == null ? other.getLogisticsMethodCode() == null : this.getLogisticsMethodCode().equals(other.getLogisticsMethodCode()))
             && (this.getLogisticsMethodName() == null ? other.getLogisticsMethodName() == null : this.getLogisticsMethodName().equals(other.getLogisticsMethodName()))
             && (this.getHasInnersale() == null ? other.getHasInnersale() == null : this.getHasInnersale().equals(other.getHasInnersale()))
-            && (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId()));
+            && (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId()))
+            && (this.getBailunRefundStatus() == null ? other.getBailunRefundStatus() == null : this.getBailunRefundStatus().equals(other.getBailunRefundStatus()))
+            && (this.getRefundObj() == null ? other.getRefundObj() == null : this.getRefundObj().equals(other.getRefundObj()))
+            && (this.getRefundType() == null ? other.getRefundType() == null : this.getRefundType().equals(other.getRefundType()))
+            && (this.getRefundReferenceId() == null ? other.getRefundReferenceId() == null : this.getRefundReferenceId().equals(other.getRefundReferenceId()));
     }
 
     /**
@@ -1301,6 +1345,10 @@ public class DcBaseOmsSku {
         result = prime * result + ((getLogisticsMethodName() == null) ? 0 : getLogisticsMethodName().hashCode());
         result = prime * result + ((getHasInnersale() == null) ? 0 : getHasInnersale().hashCode());
         result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode());
+        result = prime * result + ((getBailunRefundStatus() == null) ? 0 : getBailunRefundStatus().hashCode());
+        result = prime * result + ((getRefundObj() == null) ? 0 : getRefundObj().hashCode());
+        result = prime * result + ((getRefundType() == null) ? 0 : getRefundType().hashCode());
+        result = prime * result + ((getRefundReferenceId() == null) ? 0 : getRefundReferenceId().hashCode());
         return result;
     }
 }
\ No newline at end of file