去除利润率

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

@@ -15,6 +15,7 @@ import com.bailuntec.utils.OkHttpUtil;
 import com.bailuntec.utils.PropertiesUtil;
 import com.bailuntec.utils.SessionUtil;
 import com.dangdang.ddframe.job.api.ShardingContext;
+import lombok.extern.slf4j.Slf4j;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
@@ -28,6 +29,7 @@ import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.HashMap;
 
+@Slf4j
 public class CrmRefundSyncJob extends PointJob {
     private PropertiesUtil propertiesUtil = PropertiesUtil.getInstance("const");
     private OkHttpClient client = OkHttpUtil.getInstance();
@@ -66,7 +68,7 @@ public class CrmRefundSyncJob extends PointJob {
                     totalPage = refundDetails.getTotalPages();
                     if (refundDetails.getItems() != null && refundDetails.getItems().size() > 0) {
                         try {
-                            DcBaseCrmRefundMapper mapper = SessionUtil.getTranstionSession().getMapper(DcBaseCrmRefundMapper.class);
+                            DcBaseCrmRefundMapper mapper = SessionUtil.getSession().getMapper(DcBaseCrmRefundMapper.class);
                             for (RefundItem refundItem : refundDetails.getItems()) {
                                 DcBaseCrmRefund dcBaseCrmRefund = new DcBaseCrmRefund();
                                 try {
@@ -74,6 +76,7 @@ public class CrmRefundSyncJob extends PointJob {
                                     dcBaseCrmRefund.setRefundTime(LocalDateTime.ofInstant(refundItem.getRefundedTime().toInstant(), ZoneId.systemDefault()));
                                     BigDecimal exchangeRate = CallBailunSystem.getExchangeRate(dcBaseCrmRefund.getOrderCurrency(), "CNY", dcBaseCrmRefund.getRefundTime());
                                     dcBaseCrmRefund.setAmountRefundRmb(exchangeRate.multiply(dcBaseCrmRefund.getAmountRefund()));
+                                    log.warn(dcBaseCrmRefund.getOriginOrderId() +"------" + dcBaseCrmRefund.getBailunAccountId() +"------" + dcBaseCrmRefund.getBailunSku());
                                 } catch (Exception e) {
                                     e.printStackTrace();
                                     throw new RuntimeException("CRM退款BeanUtils.copyProperties失败", e);
@@ -82,7 +85,7 @@ public class CrmRefundSyncJob extends PointJob {
                                 if (i == 0) {
                                     mapper.insertSelective(dcBaseCrmRefund);
                                 }
-                                SessionUtil.getSession().commit();
+                             //   SessionUtil.getSession().commit();
                             }
                         } catch (Exception e) {
                             throw new RuntimeException("MYBATIS操作DB异常", e);

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

@@ -73,15 +73,10 @@ public class RefundLinkOrderJob extends PointJob {
                                 BigDecimal amountSales = dcBaseOmsOrder.getAmountSales().multiply(dcBaseOmsOrder.getSellerOrderExchangeRate());
                                 dcBaseOmsOrder.setProfitRate(amountSales.compareTo(BigDecimal.ZERO) == 0?BigDecimal.ZERO :  profit.divide(amountSales,5,RoundingMode.HALF_EVEN));
                                 dcBaseCrmRefund.setLinked(true);
-                                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();
-                                }
+                                DcBaseCrmRefundMapper refundMapper2 = SessionUtil.getSession().getMapper(DcBaseCrmRefundMapper.class);
+                                DcBaseOmsOrderMapper omsOrderMapper2 = SessionUtil.getSession().getMapper(DcBaseOmsOrderMapper.class);
+                                omsOrderMapper2.updateByPrimaryKeySelective(dcBaseOmsOrder);
+                                refundMapper2.updateByPrimaryKeySelective(dcBaseCrmRefund);
                             }
                         }
                     }

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

@@ -993,11 +993,12 @@ public class OrderSyncJob extends PointJob {
         dcBaseOmsOrder.setAmountRefund(BigDecimal.ZERO);
         //销售额 - 需要计算的费用给个默认值
         dcBaseOmsOrder.setAmountSales(BigDecimal.ZERO);
+
+        dcBaseOmsOrder.setBailunRefundStatus(omsResult.getRefundInfo().getRefundStatus());
+        dcBaseOmsOrder.setRefundObj(omsResult.getRefundInfo().getRefundObj());
+        dcBaseOmsOrder.setRefundReferenceId(omsResult.getRefundInfo().getRefundReferenceId());
         /*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);