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

base-module/src/main/java/com/caimei/module/base/entity/bo/Router.java

@@ -15,7 +15,7 @@ public class Router {
      * 描述
      */
     private String desc;
-
+    private String context;
     /**
      * 时间
      */

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/java/com/caimei/module/pay/service/impl/PayServiceImpl.java

@@ -367,7 +367,7 @@ public class PayServiceImpl implements PayService {
                     BigDecimal shipping = payDao.findShipping(order.getOrderID(), shopOrder.getShopID());
                     shopPostFee = MathUtil.sub(shopPostFee, shipping);
                     if (MathUtil.compare(splitAmount, shopPostFee) > -1) {
-                        splitAmount = MathUtil.sub(splitAmount, shipping);
+                        splitAmount = MathUtil.sub(splitAmount, shopPostFee);
                     } else {
                         shopPostFee = splitAmount;
                         splitAmount = BigDecimal.ZERO;

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">

product/src/main/resources/com-caimei-module-product/ProductModuleMapper.xml

@@ -596,10 +596,8 @@
     <select id="findAuthProductByProductId" resultType="com.caimei.module.base.entity.vo.AuthProductVo">
         select p.name  as productName,
                p.snCode,
-               p.image as productImage,
                p.pcImage,
                p.appletsImage,
-               p.certificateImage,
                p.pcCertificateImage,
                p.appletsCertificateImage,
                p.brandId,