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

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;

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,