Merge remote-tracking branch 'remotes/origin/developerC' into developer

base-module/src/main/java/com/caimei/module/base/entity/vo/LogisticsRecordVo.java

@@ -13,11 +13,6 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class LogisticsRecordVo extends CmLogisticsRecord {
-    /**
-     * 商品id
-     */
-    private Long productID;
-
     /**
      * 已发货数量
      */

pay/src/main/resources/com-caimei-module-pay/PayMapper.xml

@@ -484,6 +484,7 @@
         AND cdr.receiptDate <![CDATA[  <=  ]]> #{currentTime}
         AND co.organizeID = 0
         AND co.orderType != 2
+        AND co.refundType != 2
     </select>
 
     <select id="findByMbOrderId" resultType="com.caimei.module.base.entity.vo.SplitAccountVo">