CRM退款修改

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

@@ -103,8 +103,10 @@ public class CrmRefundSyncJob extends PointJob {
                                         dcBaseOmsOrder = omsOrderMapper.selectOneByExample(DcBaseOmsOrderExample.newAndCreateCriteria().andBailunAccountIdEqualTo(dcBaseCrmRefund.getBailunAccountId()).andOriginOrderIdEqualTo(dcBaseOmsOrder.getAftermergedBailunOrderNo()).example());
                                     }
                                     if(dcBaseOmsOrder != null) {
-                                        dcBaseCrmRefund.setShippingStatus(dcBaseOmsOrder.getBailunShippingStatus());
                                         dcBaseCrmRefund.setOrderStatus(dcBaseOmsOrder.getBailunOrderStatus());
+                                        if("FBA".equals(dcBaseCrmRefund.getPlatformType().toUpperCase())) {
+                                            dcBaseCrmRefund.setShippingStatus("TotalShipping");
+                                        }
                                     }
                                 }
 
@@ -132,10 +134,8 @@ public class CrmRefundSyncJob extends PointJob {
             }
         }
         while (true);
-        if (jobPointLog.getPageIndex() > totalPage) {
             jobPointLog.setPageIndex(1);
             jobPointLog.setStartTime(jobPointLog.getEndTime());
             jobPointLog.setEndTime(jobPointLog.getEndTime().plusDays(jobPointLog.getIntervalTime()).isAfter(LocalDateTime.now()) ? LocalDateTime.now() : jobPointLog.getEndTime().plusDays(jobPointLog.getIntervalTime()));
-        }
     }
 }

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

@@ -64,9 +64,6 @@ public interface DcBaseCrmRefundMapper {
      */
     List<DcBaseCrmRefund> selectByExample(DcBaseCrmRefundExample example);
 
-
-    List<DcBaseCrmRefund> selectByExample1(DcBaseCrmRefundExample example);
-
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table dc_base_crm_refund

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

@@ -116,18 +116,30 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    select <include refid="Base_Column_List" /> from dc_base_crm_refund where date_format(refund_time, '%Y-%m') = '2019-07' and order_status = ''
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from dc_base_crm_refund
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+    <if test="rows != null">
+      <if test="offset != null">
+        limit ${offset}, ${rows}
+      </if>
+      <if test="offset == null">
+        limit ${rows}
+      </if>
+    </if>
 
   </select>
 
 
-  <select id="selectByExample1" parameterType="com.bailuntec.domain.example.DcBaseCrmRefundExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-    -->
-    select dc0.origin_order_id, dc0.crm_id, dc0.platform_type, dc0.bailun_account_id from dc_base_crm_refund dc0 where date_format(dc0.refund_time, '%Y-%m') = '2019-08'
-  </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated