订单fba费用修改

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

@@ -199,7 +199,7 @@ public class OrderSyncJob extends PointJob {
                                   dcBaseOmsOrder.setHasFbaFee(true);
                               }else {
                                   DcBaseOmsSkuMapper dcBaseOmsSkuMapper = SessionUtil.getSession().getMapper(DcBaseOmsSkuMapper.class);
-                                  BigDecimal FBAFee = dcBaseOmsSkuMapper.selectFBAFee(dcBaseOmsSku.getBailunSku(), dcBaseOmsSku.getWebsite());
+                                  BigDecimal FBAFee = dcBaseOmsSkuMapper.selectFBAFee(dcBaseOmsSku.getBailunSku(), dcBaseOmsSku.getWebsite(), dcBaseOmsSku.getPaidTime());
                                   dcBaseOmsSku.setCostFbaFee(FBAFee == null ? BigDecimal.valueOf(0) : FBAFee);
                                   omsOrderFBAFee = omsOrderFBAFee.add(FBAFee);
                               }

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

@@ -6,6 +6,7 @@ import com.bailuntec.domain.pojo.FbaFeeSku;
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.List;
 
 public interface DcBaseOmsSkuMapper {
@@ -129,5 +130,5 @@ public interface DcBaseOmsSkuMapper {
 
     List<Double> listFbaFee(@Param("bailunSku") String bailunSku, @Param("website") String website, @Param("timeInterval") int timeInterval);
 
-    BigDecimal selectFBAFee(@Param("bailunSku") String bailunSku, @Param("webSite") String webSite);
+    BigDecimal selectFBAFee(@Param("bailunSku") String bailunSku, @Param("webSite") String webSite, @Param("paidTime")LocalDateTime paidTime);
 }
\ No newline at end of file

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

@@ -3190,7 +3190,7 @@
   </select>
 
   <select id="selectFBAFee" resultType="java.math.BigDecimal">
-    SELECT cost_fba_fee FROM dc_base_oms_sku WHERE platform_type='FBA' AND bailun_sku=#{bailunSku} AND website=#{webSite} order by paid_time desc limit 1
+    SELECT cost_fba_fee FROM dc_base_oms_sku WHERE platform_type='FBA' AND bailun_sku=#{bailunSku} AND website=#{webSite} AND paid_time &lt; #{paidTime}  order by paid_time desc limit 1
   </select>
 
 </mapper>
\ No newline at end of file