order退款

data-base/base-sync-crm-refund/src/main/java/com/bailuntec/domain/pojo/RefundItem.java

@@ -33,10 +33,16 @@ public class RefundItem {
     private String amountRefundUsd;
     @JSONField(name = "RefundTime")
     private Date refundedTime;
+    @JSONField(name = "OrderTotalAmount")
+    private BigDecimal orderTotalAmount;
+    @JSONField(name = "USDOrderTotalAmount")
+    private BigDecimal usdOrderTotalAmount;
+    @JSONField(name = "ProductSaleAmount")
+    private BigDecimal productSaleAmount;
     @JSONField(name = "ProductPrice")
     private BigDecimal bailunSkuUnitPrice;
     @JSONField(name = "ProductShipCount")
-    private Integer ProductShipCount;
+    private Integer productShipCount;
     @JSONField(name = "RefundQuantity")
     private Integer bailunSkuQuantityRefund;
 

data-base/base-sync-crm-refund/src/main/java/com/bailuntec/job/CrmRefundSyncJob.java

@@ -66,7 +66,7 @@ public class CrmRefundSyncJob extends PointJob {
                     totalPage = refundDetails.getTotalPages();
                     if (refundDetails.getItems() != null && refundDetails.getItems().size() > 0) {
                         try {
-                            DcBaseCrmRefundMapper mapper = SessionUtil.getSession().getMapper(DcBaseCrmRefundMapper.class);
+                            DcBaseCrmRefundMapper mapper = SessionUtil.getTranstionSession().getMapper(DcBaseCrmRefundMapper.class);
                             for (RefundItem refundItem : refundDetails.getItems()) {
                                 DcBaseCrmRefund dcBaseCrmRefund = new DcBaseCrmRefund();
                                 try {

data-base/base-sync-crm-refund/src/main/java/com/bailuntec/job/RefundLinkOrderJob.java

@@ -27,7 +27,6 @@ public class RefundLinkOrderJob extends PointJob {
         try {
             DcBaseCrmRefundMapper refundMapper = SessionUtil.getSession().getMapper(DcBaseCrmRefundMapper.class);
             count = refundMapper.countByExample(DcBaseCrmRefundExample.newAndCreateCriteria().andLinkedEqualTo(false).example());
-            SessionUtil.getSession().commit();
         } catch (Exception e) {
             e.printStackTrace();
             throw new RuntimeException("Mybatis查询DB失败");
@@ -85,9 +84,16 @@ public class RefundLinkOrderJob extends PointJob {
                                 BigDecimal amountSalesSku = dcBaseOmsSku.getAmountSales().multiply(dcBaseOmsSku.getSellerOrderExchangeRate());
                                 dcBaseOmsOrder.setProfitRate(amountSalesSku.compareTo(BigDecimal.ZERO) == 0?BigDecimal.ZERO :  profitSku.divide(amountSalesSku,5,RoundingMode.HALF_EVEN));
                                 dcBaseCrmRefund.setLinked(true);
-                                omsSkuMapper.updateByPrimaryKeySelective(dcBaseOmsSku);
-                                omsOrderMapper.updateByPrimaryKeySelective(dcBaseOmsOrder);
-                                refundMapper1.updateByPrimaryKeySelective(dcBaseCrmRefund);
+                               // omsSkuMapper.updateByPrimaryKeySelective(dcBaseOmsSku);
+                                try{
+                                    DcBaseCrmRefundMapper refundMapper2 = SessionUtil.getTranstionSession().getMapper(DcBaseCrmRefundMapper.class);
+                                    DcBaseOmsOrderMapper omsOrderMapper2 = SessionUtil.getTranstionSession().getMapper(DcBaseOmsOrderMapper.class);
+                                    omsOrderMapper2.updateByPrimaryKeySelective(dcBaseOmsOrder);
+                                    refundMapper2.updateByPrimaryKeySelective(dcBaseCrmRefund);
+                                    SessionUtil.getTranstionSession().commit();
+                                }catch (Exception e){
+                                 SessionUtil.getTranstionSession().rollback();
+                                }
                             }
                         }
                     }

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

@@ -179,6 +179,42 @@ public class DcBaseCrmRefund {
     private BigDecimal amountRefundUsd;
 
     /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_crm_refund.company_id
+     *
+     * @mbg.generated
+     */
+    private Integer companyId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_crm_refund.order_total_amount
+     *
+     * @mbg.generated
+     */
+    private BigDecimal orderTotalAmount;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_crm_refund.usd_order_total_amount
+     *
+     * @mbg.generated
+     */
+    private BigDecimal usdOrderTotalAmount;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dc_base_crm_refund.product_sale_amount
+     *
+     * @mbg.generated
+     */
+    private BigDecimal productSaleAmount;
+
+    /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table dc_base_crm_refund
      *
@@ -209,6 +245,10 @@ public class DcBaseCrmRefund {
         sb.append(", amountRefundRmb=").append(amountRefundRmb);
         sb.append(", crmId=").append(crmId);
         sb.append(", amountRefundUsd=").append(amountRefundUsd);
+        sb.append(", companyId=").append(companyId);
+        sb.append(", orderTotalAmount=").append(orderTotalAmount);
+        sb.append(", usdOrderTotalAmount=").append(usdOrderTotalAmount);
+        sb.append(", productSaleAmount=").append(productSaleAmount);
         sb.append("]");
         return sb.toString();
     }
@@ -249,7 +289,11 @@ public class DcBaseCrmRefund {
             && (this.getLinked() == null ? other.getLinked() == null : this.getLinked().equals(other.getLinked()))
             && (this.getAmountRefundRmb() == null ? other.getAmountRefundRmb() == null : this.getAmountRefundRmb().equals(other.getAmountRefundRmb()))
             && (this.getCrmId() == null ? other.getCrmId() == null : this.getCrmId().equals(other.getCrmId()))
-            && (this.getAmountRefundUsd() == null ? other.getAmountRefundUsd() == null : this.getAmountRefundUsd().equals(other.getAmountRefundUsd()));
+            && (this.getAmountRefundUsd() == null ? other.getAmountRefundUsd() == null : this.getAmountRefundUsd().equals(other.getAmountRefundUsd()))
+            && (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId()))
+            && (this.getOrderTotalAmount() == null ? other.getOrderTotalAmount() == null : this.getOrderTotalAmount().equals(other.getOrderTotalAmount()))
+            && (this.getUsdOrderTotalAmount() == null ? other.getUsdOrderTotalAmount() == null : this.getUsdOrderTotalAmount().equals(other.getUsdOrderTotalAmount()))
+            && (this.getProductSaleAmount() == null ? other.getProductSaleAmount() == null : this.getProductSaleAmount().equals(other.getProductSaleAmount()));
     }
 
     /**
@@ -281,6 +325,10 @@ public class DcBaseCrmRefund {
         result = prime * result + ((getAmountRefundRmb() == null) ? 0 : getAmountRefundRmb().hashCode());
         result = prime * result + ((getCrmId() == null) ? 0 : getCrmId().hashCode());
         result = prime * result + ((getAmountRefundUsd() == null) ? 0 : getAmountRefundUsd().hashCode());
+        result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode());
+        result = prime * result + ((getOrderTotalAmount() == null) ? 0 : getOrderTotalAmount().hashCode());
+        result = prime * result + ((getUsdOrderTotalAmount() == null) ? 0 : getUsdOrderTotalAmount().hashCode());
+        result = prime * result + ((getProductSaleAmount() == null) ? 0 : getProductSaleAmount().hashCode());
         return result;
     }
 }
\ No newline at end of file

data-common/src/main/java/com/bailuntec/domain/example/DcBaseCrmRefundExample.java

@@ -1580,6 +1580,246 @@ public class DcBaseCrmRefundExample {
             addCriterion("amount_refund_usd not between", value1, value2, "amountRefundUsd");
             return (Criteria) this;
         }
+
+        public Criteria andCompanyIdIsNull() {
+            addCriterion("company_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNotNull() {
+            addCriterion("company_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdEqualTo(Integer value) {
+            addCriterion("company_id =", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotEqualTo(Integer value) {
+            addCriterion("company_id <>", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThan(Integer value) {
+            addCriterion("company_id >", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("company_id >=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThan(Integer value) {
+            addCriterion("company_id <", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThanOrEqualTo(Integer value) {
+            addCriterion("company_id <=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIn(List<Integer> values) {
+            addCriterion("company_id in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotIn(List<Integer> values) {
+            addCriterion("company_id not in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdBetween(Integer value1, Integer value2) {
+            addCriterion("company_id between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("company_id not between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderTotalAmountIsNull() {
+            addCriterion("order_total_amount is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderTotalAmountIsNotNull() {
+            addCriterion("order_total_amount is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderTotalAmountEqualTo(BigDecimal value) {
+            addCriterion("order_total_amount =", value, "orderTotalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderTotalAmountNotEqualTo(BigDecimal value) {
+            addCriterion("order_total_amount <>", value, "orderTotalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderTotalAmountGreaterThan(BigDecimal value) {
+            addCriterion("order_total_amount >", value, "orderTotalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderTotalAmountGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("order_total_amount >=", value, "orderTotalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderTotalAmountLessThan(BigDecimal value) {
+            addCriterion("order_total_amount <", value, "orderTotalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderTotalAmountLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("order_total_amount <=", value, "orderTotalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderTotalAmountIn(List<BigDecimal> values) {
+            addCriterion("order_total_amount in", values, "orderTotalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderTotalAmountNotIn(List<BigDecimal> values) {
+            addCriterion("order_total_amount not in", values, "orderTotalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderTotalAmountBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("order_total_amount between", value1, value2, "orderTotalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderTotalAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("order_total_amount not between", value1, value2, "orderTotalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsdOrderTotalAmountIsNull() {
+            addCriterion("usd_order_total_amount is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsdOrderTotalAmountIsNotNull() {
+            addCriterion("usd_order_total_amount is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsdOrderTotalAmountEqualTo(BigDecimal value) {
+            addCriterion("usd_order_total_amount =", value, "usdOrderTotalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsdOrderTotalAmountNotEqualTo(BigDecimal value) {
+            addCriterion("usd_order_total_amount <>", value, "usdOrderTotalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsdOrderTotalAmountGreaterThan(BigDecimal value) {
+            addCriterion("usd_order_total_amount >", value, "usdOrderTotalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsdOrderTotalAmountGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("usd_order_total_amount >=", value, "usdOrderTotalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsdOrderTotalAmountLessThan(BigDecimal value) {
+            addCriterion("usd_order_total_amount <", value, "usdOrderTotalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsdOrderTotalAmountLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("usd_order_total_amount <=", value, "usdOrderTotalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsdOrderTotalAmountIn(List<BigDecimal> values) {
+            addCriterion("usd_order_total_amount in", values, "usdOrderTotalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsdOrderTotalAmountNotIn(List<BigDecimal> values) {
+            addCriterion("usd_order_total_amount not in", values, "usdOrderTotalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsdOrderTotalAmountBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("usd_order_total_amount between", value1, value2, "usdOrderTotalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andUsdOrderTotalAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("usd_order_total_amount not between", value1, value2, "usdOrderTotalAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSaleAmountIsNull() {
+            addCriterion("product_sale_amount is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSaleAmountIsNotNull() {
+            addCriterion("product_sale_amount is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSaleAmountEqualTo(BigDecimal value) {
+            addCriterion("product_sale_amount =", value, "productSaleAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSaleAmountNotEqualTo(BigDecimal value) {
+            addCriterion("product_sale_amount <>", value, "productSaleAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSaleAmountGreaterThan(BigDecimal value) {
+            addCriterion("product_sale_amount >", value, "productSaleAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSaleAmountGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("product_sale_amount >=", value, "productSaleAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSaleAmountLessThan(BigDecimal value) {
+            addCriterion("product_sale_amount <", value, "productSaleAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSaleAmountLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("product_sale_amount <=", value, "productSaleAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSaleAmountIn(List<BigDecimal> values) {
+            addCriterion("product_sale_amount in", values, "productSaleAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSaleAmountNotIn(List<BigDecimal> values) {
+            addCriterion("product_sale_amount not in", values, "productSaleAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSaleAmountBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("product_sale_amount between", value1, value2, "productSaleAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductSaleAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("product_sale_amount not between", value1, value2, "productSaleAmount");
+            return (Criteria) this;
+        }
     }
 
     /**