运费

src/main/java/com/caimei365/order/service/impl/SubmitServiceImpl.java

@@ -506,6 +506,8 @@ public class SubmitServiceImpl implements SubmitService {
                 secondHandOrderFlag = true;
             }
             log.info("postageFlag*****************" + postageFlag);
+            // 运费方式为空： 赠品 包邮
+            postageFlag = null == postageFlag ? 0 : postageFlag;
             // 运费
             Double postage = 0d;
             // 在 运费类型为有运费时 运费生效

src/main/resources/mapper/ReceiptMapper.xml

@@ -1253,6 +1253,7 @@
                         cso.organizeId,
                         cso.shopStatus as status,
                         ifnull(cso.orderStatusFlag,1) as orderStatusFlag,
+                        IFNULL(cso.refundStatus, 1) AS refundStatus,
                         s.name                            AS shopName,
                         (SELECT SUM(cmCostPrice*(num+presentnum) )FROM cm_order_product WHERE shopOrderId = cso.shopOrderId) AS cmCostPrice,
                         (select userName from user where userID = cso.userId LIMIT 1) as userName,
@@ -1301,6 +1302,7 @@
         cso.organizeId,
         cso.shopStatus as status,
         ifnull(cso.orderStatusFlag,1) as orderStatusFlag,
+        IFNULL(cso.refundStatus, 1) AS refundStatus,
         (select userName from user where userID = cso.userId LIMIT 1) as userName,
         sum(cror.associateAmount) as receiptAmount,
         ifnull(cso.sendOutStatus, 1) as sendOutStatus,