联合丽格1.0.2

src/main/java/com/caimei365/order/components/OrderCommonService.java

@@ -357,7 +357,7 @@ public class OrderCommonService {
                     open = "";
                     close = "";
                 }
-                if (-1 == shopOrder.getShopPostFlag()) {
+                if (2 == shopOrder.getShopPostFlag()) {
                     // 到付
                     shopOrder.setPostageInfo("￥" + MathUtil.add(shopOrder.getShopPostFee(), shopOrder.getColdChina()).doubleValue() + open +(shopOrder.getIsColdChina()==1?"冷链费: ￥" + shopOrder.getColdChina().doubleValue():"") + (arrList.stream().allMatch(c -> c == 1)?"":" 其他: 到付")+close);
                 } else if (0 == shopOrder.getShopPostFlag()) {
@@ -368,7 +368,7 @@ public class OrderCommonService {
                     shopOrder.setPostageInfo("￥" + MathUtil.add(shopOrder.getShopPostFee(), shopOrder.getColdChina()).doubleValue() + open +(shopOrder.getIsColdChina()==1?"冷链费: ￥" + shopOrder.getColdChina().doubleValue():"") + (!arrList.stream().allMatch(c -> c == 1)?" 其他: ￥" + shopOrder.getShopPostFee():"") + close);
                 }
             } else {
-                shopOrder.setPostageInfo(shopOrder.getShopPostFlag() == -1?"到付":shopOrder.getShopPostFlag() == 0?"包邮":"￥" + shopOrder.getShopPostFee().doubleValue());
+                shopOrder.setPostageInfo(shopOrder.getShopPostFlag() == 2 ?"到付":shopOrder.getShopPostFlag() == 0?"包邮":"￥" + shopOrder.getShopPostFee());
             }
             shopOrder.setOrderProductList(orderProductList);
             shopOrder.setShopLogo(ImageUtil.getImageUrl("shopLogo", shopOrder.getShopLogo(), domain));
@@ -463,7 +463,7 @@ public class OrderCommonService {
             shopOrder.setColdChina(0.00d);
         }
         // 拼接运费信息--联合丽格
-        if (null != shopOrder.getColdChina()) {
+        if (null != shopOrder.getColdChina() && null != shopOrder.getIsColdChina() && 1 == shopOrder.getIsColdChina()) {
             String open = "";
             String close = "";
             if (shopOrder.getIsColdChina()==1) {
@@ -476,7 +476,7 @@ public class OrderCommonService {
                 open = "";
                 close = "";
             }
-            if (-1 == shopOrder.getShopPostFlag()) {
+            if (2 == shopOrder.getShopPostFlag()) {
                 // 到付
                 shopOrder.setPostageInfo("￥" + MathUtil.add(shopOrder.getShopPostFee(), shopOrder.getColdChina()).doubleValue() + open +(shopOrder.getIsColdChina()==1?"冷链费: ￥" + shopOrder.getColdChina().doubleValue():"") + (arrList.stream().allMatch(c -> c == 1)?"":" 其他: 到付")+close);
             } else if (0 == shopOrder.getShopPostFlag()) {
@@ -487,7 +487,7 @@ public class OrderCommonService {
                 shopOrder.setPostageInfo("￥" + MathUtil.add(shopOrder.getShopPostFee(), shopOrder.getColdChina()).doubleValue() + open +(shopOrder.getIsColdChina()==1?"冷链费: ￥" + shopOrder.getColdChina().doubleValue():"") + (!arrList.stream().allMatch(c -> c == 1)?" 其他: ￥" + shopOrder.getShopPostFee():"") + close);
             }
         } else {
-            shopOrder.setPostageInfo(shopOrder.getShopPostFlag() == -1?"到付":shopOrder.getShopPostFlag() == 0?"包邮":"￥" + shopOrder.getShopPostFee().doubleValue());
+            shopOrder.setPostageInfo(shopOrder.getShopPostFlag() == 2?"到付":shopOrder.getShopPostFlag() == 0?"包邮":"￥" + shopOrder.getShopPostFee());
         }
     }
 

src/main/java/com/caimei365/order/components/ProductService.java

@@ -423,9 +423,13 @@ public class ProductService {
             log.info(note + ">>>>>>>>>>>收款项和订单关系(insert[cm_receipt_order_relation])id：" + relation.getId() + "，shopOrderId：" + shopOrder.getShopOrderId());
             // 修改子订单状态
             shopOrderVo.setShopOrderId(shopOrder.getShopOrderId());
+            // 订单状态
             shopOrderVo.setReceiptStatus(shopOrder.getReceiptStatus());
-            shopOrderVo.setAccountAmount(shopOrderPay);
-            shopOrderVo.setReceiptAmount(shopOrderPay);
+            // 余额抵扣金额
+            shopOrderVo.setAccountAmount(MathUtil.add(shopOrderVo.getAccountAmount(), shopOrderPay).doubleValue());
+            // 用户已付金额
+            shopOrderVo.setReceiptAmount(MathUtil.add(shopOrderVo.getReceiptAmount(), shopOrderPay).doubleValue());
+            // 余额抵扣状态
             shopOrderVo.setUseBalanceFlag(1);
             payOrderMapper.updateShopOrderBalancePay(shopOrderVo);
 
@@ -496,7 +500,10 @@ public class ProductService {
 
         // 修改子订单状态
         shopOrder.setAccountAmount(shopOrderPay);
+        // 用户已付金额
         shopOrder.setReceiptAmount(MathUtil.add(shopOrder.getReceiptAmount(),shopOrderPay).doubleValue());
+        // 余额抵扣状态
+        shopOrder.setUseBalanceFlag(1);
         payOrderMapper.updateShopOrderBalancePay(shopOrder);
 
     }

src/main/java/com/caimei365/order/controller/ShipApi.java

@@ -8,6 +8,7 @@ import com.caimei365.order.service.ShipService;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.bind.annotation.*;
@@ -30,6 +31,7 @@ import java.util.Map;
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/order/shop")
+@Slf4j
 public class ShipApi {
     private final ShipService shipService;
 
@@ -97,20 +99,17 @@ public class ShipApi {
      * @param response
      */
     @PostMapping("/exportExcel")
-    public void exportExcel(Integer shopId, String shopOrderNo, Integer payStatus, String name, String beginTime, String endTime, Integer refundStatus,
-                            @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
-                            @RequestParam(value = "pageSize", defaultValue = "10") int pageSize,
-                            HttpServletResponse response) {
+    public void exportExcel(Integer shopId, String shopOrderNo, Integer payStatus, String name, String beginTime, String endTime, Integer refundStatus, HttpServletResponse response) {
         String file = "结算列表数据";
         try {
-            ResponseJson<PageInfo<SettlementVo>> pageInfo = shipService.exportExcel(shopId, payStatus, shopOrderNo, name, beginTime, endTime, refundStatus, pageNum, pageSize);
+            List<SettlementDto> list = shipService.exportExcel(shopId, payStatus, shopOrderNo, name, beginTime, endTime, refundStatus);
             SettlementDto settLementDto = new SettlementDto();
             response.setContentType("application/vnd.ms-excel");
             response.setCharacterEncoding("utf-8");
             // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系
             String fileName = URLEncoder.encode(file, "UTF-8").replaceAll("\\+", "%20");
             response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
-            EasyExcel.write(response.getOutputStream(), settLementDto.getClass()).autoCloseStream(Boolean.TRUE).sheet("数据").doWrite(pageInfo.getData().getList());
+            EasyExcel.write(response.getOutputStream(), settLementDto.getClass()).autoCloseStream(Boolean.TRUE).sheet("数据").doWrite(list);
         } catch (Exception e) {
             e.printStackTrace();
         }

src/main/java/com/caimei365/order/service/ShipService.java

@@ -53,7 +53,7 @@ public interface ShipService {
      * @param refundStatus
      * @return
      */
-    ResponseJson<PageInfo<SettlementVo>> exportExcel(Integer shopId, Integer payStatus, String shopOrderNo, String name, String beginTime, String endTime, Integer refundStatus,Integer pageNum, Integer pageSize);
+    List<SettlementDto> exportExcel(Integer shopId, Integer payStatus, String shopOrderNo, String name, String beginTime, String endTime, Integer refundStatus);
     /**
      * 供应商子订单详情
      * @param shopOrderId 子订单Id

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

@@ -29,6 +29,7 @@ import com.caimei365.order.utils.helipay.HttpClientService;
 import com.caimei365.order.utils.helipay.MessageHandle;
 import com.caimei365.order.utils.helipay.MyBeanUtils;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.util.concurrent.AtomicDouble;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpStatus;
@@ -1261,9 +1262,11 @@ public class HeliPayServiceImpl implements HeliPayService {
             }
             // 支付记录
             List<DiscernReceiptVo> shopOrderReceipt = orderCommonMapper.getShopOrderReceipt(shopOrder.getShopOrderId());
+            AtomicDouble finalReceiptAmount = new AtomicDouble(0d);
             // 1线上，2线下，3余额抵扣
             if (null != shopOrderReceipt) {
                 shopOrderReceipt.forEach(receipt -> {
+                    finalReceiptAmount.set(MathUtil.add(finalReceiptAmount.get(), receipt.getReceiptAmount()).doubleValue());
                     if (1 == receipt.getPayWay()) {
                         onlinePay.set(1);
                     } else {
@@ -1271,6 +1274,7 @@ public class HeliPayServiceImpl implements HeliPayService {
                     }
                 });
             }
+            shopOrder.setReceiptAmount(MathUtil.add(shopOrder.getReceiptAmount(), finalReceiptAmount.get()).doubleValue());
             shopOrder.setOnlinePay(onlinePay.get());
             orderCommonService.setPostageInfo(shopOrder);
         });

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

@@ -180,6 +180,8 @@ public class PayOrderServiceImpl implements PayOrderService {
             //设置真实支付金额
             shopOrder.setReceiptAmount(MathUtil.sub(shopOrder.getReceiptAmount(), balancePayFee).doubleValue());
             shopOrder.setOnlinePay(1);
+            // 余额抵扣状态
+            shopOrder.setUseBalanceFlag(1);
             // 更新订单支付状态
             payOrderMapper.updateShopOrderBalancePay(shopOrder);
             // 修改账户余额
@@ -688,6 +690,10 @@ public class PayOrderServiceImpl implements PayOrderService {
         }
         shop.setReceiptAmount(receiptAmount.get());
         shop.setEachDiscount(orderCommonMapper.findEachDiscount(shopOrderId));
+        // 待付金额
+        if (null == shop.getRealPay()) {
+            shop.setRealPay(shop.getNeedPayAmount());
+        }
         shop.setObligation(MathUtil.sub(shop.getRealPay(), receiptAmount.get()).doubleValue());
         if (998 == shop.getShopId()) {
             shop.setObligation(orderCommonMapper.findShopFee(shopOrderId));

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

@@ -194,10 +194,9 @@ public class ShipServiceImpl implements ShipService {
      * @return
      */
     @Override
-    public ResponseJson<PageInfo<SettlementVo>> exportExcel(Integer shopId, Integer payStatus, String shopOrderNo, String name, String beginTime, String endTime, Integer refundStatus,Integer pageNum, Integer pageSize) {
-        PageHelper.startPage(pageNum, pageSize);
+    public List<SettlementDto> exportExcel(Integer shopId, Integer payStatus, String shopOrderNo, String name, String beginTime, String endTime, Integer refundStatus) {
         List<SettlementVo> settlementList = shipMapper.getSettlementList(shopId, payStatus, shopOrderNo, name, beginTime, endTime, refundStatus);
-        List<SettlementDto> settlementDto = new ArrayList<>();
+        List<SettlementDto> settlementDtoList = new ArrayList<>();
         settlementList.forEach(settlement -> {
             if (null != settlement) {
                 List<OrderProductVo> orderProductList = orderCommonMapper.getShopOrderProduct(settlement.getShopOrderId());
@@ -260,7 +259,11 @@ public class ShipServiceImpl implements ShipService {
             lementDto.setOrderTime(settlement.getOrderTime());
             lementDto.setName(settlement.getName());
             if(settlement.getOrderProductList().size() > 0) {
-                lementDto.setProductInfo(settlement.getOrderProductList().get(0).getName());
+                String names = "";
+                for (OrderProductVo sett : settlement.getOrderProductList()) {
+                    names = names + sett.getName();
+                }
+                lementDto.setProductInfo(names);
             }
             lementDto.setTotalAmount(settlement.getTotalAmount());
             if (1 == settlement.getRefundStatus()) {
@@ -281,10 +284,9 @@ public class ShipServiceImpl implements ShipService {
             lementDto.setShouldPayShopAmount(settlement.getShouldPayShopAmount());
             lementDto.setPayedShopAmount(settlement.getPayedShopAmount());
             lementDto.setUnsettledAmount(MathUtil.sub(settlement.getShouldPayShopAmount(), settlement.getPayedShopAmount()).doubleValue());
-            settlementDto.add(lementDto);
+            settlementDtoList.add(lementDto);
         });
-        PageInfo<SettlementVo> pageInfo = new PageInfo(settlementList);
-        return ResponseJson.success(pageInfo);
+        return settlementDtoList;
     }
 
     /**

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

@@ -504,7 +504,11 @@ public class SubmitServiceImpl implements SubmitService {
             }
             log.info("postageFlag*****************" + postageFlag);
             // 运费
-            Double postage = Double.parseDouble(postageString);
+            Double postage = 0d;
+            // 在 运费类型为有运费时 运费生效
+            if (1 == postageFlag) {
+                postage = Double.parseDouble(postageString);
+            }
             // 供应商名称
             String shopName = baseMapper.getShopNameById(shopId);
             /*
@@ -916,6 +920,8 @@ public class SubmitServiceImpl implements SubmitService {
                 log.info("shopProductAmount.get()" + shopProductAmount.get());
                 log.info("product.getShopProductAmount()" + product.getShopProductAmount());
                 shopProductAmount.set(MathUtil.add(shopProductAmount.get(), product.getShopProductAmount()).doubleValue());
+                // 付供应商 商品费=成本价*(购买数量  + 赠品数量) + 冷链费
+                shopOrder.setShopProductAmount(MathUtil.add(shopProductAmount.get(), isColdChina.get()).doubleValue());
                 // 付供应商税费
                 shopTaxFee.set(MathUtil.add(shopTaxFee.get(), product.getShouldPayTotalTax()).doubleValue());
                 if (0 != organizeId) {
@@ -1003,8 +1009,8 @@ public class SubmitServiceImpl implements SubmitService {
             shopOrder.setItemCount(shopProductCount.get());
             // 超级会员优惠金额
             shopOrder.setSvipShopReduction(svipShopReduction.get());
-            // 总价(含税) = totalFee
-            shopOrder.setTotalAmount(MathUtil.add(shopProductFee.get(), postage).doubleValue());
+            // 总价(含税) = totalFee + 冷链费
+            shopOrder.setTotalAmount(MathUtil.add(MathUtil.add(shopProductFee.get(), postage).doubleValue(),isColdChina.get()).doubleValue());
             // 总金额 = 订单商品totalAmount
             shopOrder.setProductAmount(shopAmount.get());
             // 需要支付金额 shouldPayFee +运费
@@ -1032,7 +1038,6 @@ public class SubmitServiceImpl implements SubmitService {
             }
             // 运费标记
             shopOrder.setShopPostFlag(postageFlag);
-            log.info("shopOrder.getShopPostFlag()*****************" + shopOrder.getShopPostFlag());
             // 添加到子订单列表
             shopOrderList.add(shopOrder);
             // 统计商品总金额
@@ -1397,6 +1402,7 @@ public class SubmitServiceImpl implements SubmitService {
          */
         AtomicReference<String> shopOrderIds = new AtomicReference<>();
         AtomicInteger shopOrderIndex = new AtomicInteger(1);
+        log.info("shopOrderList===****====="+shopOrderList);
         shopOrderList.forEach(shopOrder -> {
             shopOrder.setOrderId(mainOrder.getOrderId());
             shopOrder.setOrderNo(mainOrder.getOrderNo());
@@ -1961,6 +1967,7 @@ public class SubmitServiceImpl implements SubmitService {
              */
             List<OrderShopPo> oldShop = shopOrderList.stream().filter(s -> s.getShopId().equals(shop.getShopId())).collect(Collectors.toList());
             OrderShopPo shopOrder = new OrderShopPo();
+            shopOrder.setIsColdChina(oldShop.get(0).getIsColdChina());
             shopOrder.setSplitCode(shop.getSplitCode());
             shopOrder.setShopId(shop.getShopId());
             shopOrder.setShopName(shopName);
@@ -2004,6 +2011,15 @@ public class SubmitServiceImpl implements SubmitService {
                 needPayAmount.set(MathUtil.add(needPayAmount.get(), product.getRealProductFee()).doubleValue());
                 // 统计 总金额 包括税费
                 shopProductFee.set(MathUtil.add(shopProductFee.get(), product.getRealProductFee()).doubleValue());
+                // 再勾选冷链费时
+                if (1 == oldShop.get(0).getIsColdChina() && product.getProductId() == 7536 ) {
+                    // 需要支付金额 需支付金额 + 冷链费700
+                    needPayAmount.set(MathUtil.add(needPayAmount.get(), 700).doubleValue());
+                    // 总金额 + 冷链费700
+                    shopProductFee.set(MathUtil.add(shopProductFee.get(), 700).doubleValue());
+                    // 付供应商 + 冷链费700
+                    shopProductAmount.set(MathUtil.add(shopProductAmount.get(), 700).doubleValue());
+                }
                 // 商品总金额
                 shopAmount.set(MathUtil.add(shopAmount.get(), product.getTotalAmount()).doubleValue());
                 // 付供应商 商品费
@@ -2011,7 +2027,10 @@ public class SubmitServiceImpl implements SubmitService {
                 // 付供应商税费
                 shopTaxFee.set(MathUtil.add(shopTaxFee.get(), product.getShouldPayTotalTax()).doubleValue());
             }
-
+            // 需要支付金额 需支付金额 + 运费
+            needPayAmount.set(MathUtil.add(needPayAmount.get(), oldShop.get(0).getShopPostFee()).doubleValue());
+            // 总金额 + 运费
+            shopProductFee.set(MathUtil.add(shopProductFee.get(), oldShop.get(0).getShopPostFee()).doubleValue());
             // 佣金 采美应收
             shopOrder.setBrokerage(brokerage.get());
             // 可退款金额 = 余额抵扣金额
@@ -2031,7 +2050,9 @@ public class SubmitServiceImpl implements SubmitService {
             // 付供应商 = 商品费 + 运费 + 税费
             shopOrder.setShouldPayShopAmount(MathUtil.add(shopProductAmount.get(), shopTaxFee.get()).doubleValue());
             // 付给供应商运费
-            // shopOrder.setShopPostFee(0d);
+            shopOrder.setShopPostFee(oldShop.get(0).getShopPostFee());
+            // 运费类型
+            shopOrder.setShopPostFlag(oldShop.get(0).getShopPostFlag());
             // 已付供应商金额
             shopOrder.setPayedShopAmount(0d);
             // (付款供应商)付款状态：1待付款、2部分付款、3已付款

src/main/resources/mapper/OrderClubMapper.xml

@@ -264,7 +264,7 @@
             cso.productAmount,
             cso.needPayAmount,
             cso.shopProductAmount,
-            cso.shopPostFee,
+            ifnull(cso.shopPostFee, 0) as shopPostFee,
             IFNULL(cso.shopPostFlag, 0) AS shopPostFlag,
             cso.shopTaxFee,
             cso.shouldPayShopAmount,
@@ -273,7 +273,7 @@
             cso.payStatus,
             cso.orderSubmitType,
             cso.splitFlag,
-            cso.useBalanceFlag,
+            ifnull(cso.useBalanceFlag, 0) as useBalanceFlag,
             ifnull(cso.sendOutStatus, 1) as sendOutStatus,
             co.secondHandOrderFlag as secondHandOrderFlag,
             IFNULL(cso.receiptAmount,0) AS receiptAmount,
@@ -562,7 +562,7 @@
             cso.productAmount,
             cso.needPayAmount,
             cso.shopProductAmount,
-            cso.shopPostFee,
+            ifnull(cso.shopPostFee, 0) as shopPostFee,
             IFNULL(cso.shopPostFlag, 0) AS shopPostFlag,
             cso.shopTaxFee,
             cso.shouldPayShopAmount,
@@ -571,7 +571,7 @@
             cso.payStatus,
             cso.orderSubmitType,
             cso.splitFlag,
-            cso.useBalanceFlag,
+            ifnull(cso.useBalanceFlag, 0) as useBalanceFlag,
             ifnull(cso.sendOutStatus, 1) as sendOutStatus,
             (select onlinePayFlag from cm_order where orderId = cso.orderId ) as onlinePay,
             (select secondHandOrderFlag from cm_order where orderId = cso.orderId ) as secondHandOrderFlag,
@@ -693,7 +693,7 @@
                         cso.productAmount,
                         cso.needPayAmount,
                         cso.shopProductAmount,
-                        cso.shopPostFee,
+                        ifnull(cso.shopPostFee, 0) as shopPostFee,
                         IFNULL(cso.shopPostFlag, 0) AS shopPostFlag,
                         cso.shopTaxFee,
                         cso.shouldPayShopAmount,
@@ -703,7 +703,7 @@
                         cso.payStatus,
                         cso.orderSubmitType,
                         cso.splitFlag,
-                        cso.useBalanceFlag,
+                        ifnull(cso.useBalanceFlag, 0) as useBalanceFlag,
                         ifnull(cso.sendOutStatus, 1) as sendOutStatus,
                         (SELECT secondHandOrderFlag FROM cm_order WHERE orderId = cso.orderId ) AS secondHandOrderFlag,
                         IFNULL(cso.receiptAmount,0) AS receiptAmount,

src/main/resources/mapper/OrderCommonMapper.xml

@@ -44,7 +44,7 @@
         cso.productAmount,
         cso.needPayAmount,
         cso.shopProductAmount,
-        cso.shopPostFee,
+        ifnull(cso.shopPostFee, 0) as shopPostFee,
         ifnull(cso.shopPostFlag, 0) as shopPostFlag,
         cso.shopTaxFee,
         cso.shouldPayShopAmount,
@@ -69,16 +69,29 @@
         </foreach>
     </select>
     <select id="getShopOrderReceipt" resultType="com.caimei365.order.model.vo.DiscernReceiptVo">
-        SELECT c.id, c.payWay
-        FROM cm_discern_receipt c
-                 LEFT JOIN cm_receipt_order_relation r ON r.receiptID = c.id
-        WHERE r.shopOrderId = #{shopOrderId}
-          AND r.relationType = '2'
-          AND r.delFlag = '0'
-          AND c.delFlag = '0'
-          AND c.receiptStatus = '3'
-          AND c.payType != '16'
-        limit 1
+        SELECT cdr.id,
+               cdr.payWay,
+               cdr.payType,
+               cdr.receiptType,
+               cdr.receiptStatus,
+               cdr.receiptAmount,
+               cdr.confirmType,
+               cdr.receiptDate,
+               cdr.confirmDate,
+               cdr.reviewDate,
+               cdr.updateDate,
+               cdr.delFlag,
+               cdr.quickInfoId as infoId,
+               cror.associateAmount
+        FROM cm_receipt_order_relation cror
+                 LEFT JOIN cm_discern_receipt cdr ON cror.receiptID = cdr.id
+        WHERE ((cror.orderID = #{shopOrderId} AND cror.relationType = '2') OR
+               (cror.shopOrderId = #{shopOrderId} AND cror.relationType = '2'))
+          AND cror.delFlag = '0'
+          AND cdr.delFlag = '0'
+          AND cdr.receiptStatus = '3'
+          AND cdr.payType != '16'
+        ORDER BY cdr.receiptDate DESC
     </select>
     <select id="getOrderPromotionsById" resultType="com.caimei365.order.model.vo.PromotionsVo">
         SELECT id,
@@ -486,7 +499,7 @@
         cso.needPayAmount,
         ifnull(cso.accountAmount,0) as accountAmount,
         cso.shopProductAmount,
-        cso.shopPostFee,
+        ifnull(cso.shopPostFee, 0) as shopPostFee,
         IFNULL(cso.shopPostFlag, 0) AS shopPostFlag,
         cso.shopTaxFee,
         cso.shouldPayShopAmount,
@@ -495,7 +508,7 @@
         cso.payStatus,
         cso.orderSubmitType,
         cso.splitFlag,
-        cso.useBalanceFlag,
+        ifnull(cso.useBalanceFlag, 0) as useBalanceFlag,
         ifnull(cso.sendOutStatus, 1) as sendOutStatus,
         (select secondHandOrderFlag from cm_order where orderId = cso.orderId ) as secondHandOrderFlag,
         s.name AS shopName,
@@ -581,7 +594,7 @@
                productAmount,
                needPayAmount,
                shopProductAmount,
-               shopPostFee,
+               ifnull(shopPostFee, 0) as shopPostFee,
                shopTaxFee,
                shouldPayShopAmount,
                orderTime,
@@ -805,15 +818,15 @@
                cop.productAmount,
                cop.needPayAmount,
                cop.shopProductAmount,
-               cop.shopPostFee,
+               ifnull(cop.shopPostFee, 0) as shopPostFee,
                cop.shopTaxFee,
                cop.shouldPayShopAmount,
                cop.orderTime,
                cop.orderSubmitType,
                cop.payStatus,
                cop.splitFlag,
-               cop.useBalanceFlag,
-               cop.realPay,
+               ifnull(cop.useBalanceFlag, 0) as useBalanceFlag,
+               ifnull(cop.realPay, cop.needPayAmount) as realPay,
                cop.receiptAmount,
                ifnull(cop.sendOutStatus, 1) as sendOutStatus,
                ifnull(cop.receiptStatus, 1) as receiptStatus,

src/main/resources/mapper/OrderSellerMapper.xml

@@ -121,7 +121,7 @@
         cso.productAmount,
         cso.needPayAmount,
         cso.shopProductAmount,
-        cso.shopPostFee,
+        ifnull(cso.shopPostFee, 0) as shopPostFee,
         IFNULL(cso.shopPostFlag, 0) AS shopPostFlag,
         cso.shopTaxFee,
         cso.shouldPayShopAmount,
@@ -130,7 +130,7 @@
         cso.payStatus,
         cso.orderSubmitType,
         cso.splitFlag,
-        cso.useBalanceFlag,
+        ifnull(cso.useBalanceFlag, 0) as useBalanceFlag,
         ifnull(cso.sendOutStatus, 1) as sendOutStatus,
         (select onlinePayFlag from cm_order where orderId = cso.orderId ) as onlinePay,
         (select secondHandOrderFlag from cm_order where orderId = cso.orderId ) as secondHandOrderFlag,
@@ -285,7 +285,7 @@
         cso.productAmount,
         cso.needPayAmount,
         cso.shopProductAmount,
-        cso.shopPostFee,
+        ifnull(cso.shopPostFee, 0)as shopPostFee,
         IFNULL(cso.shopPostFlag, 0) AS shopPostFlag,
         cso.shopTaxFee,
         cso.shouldPayShopAmount,
@@ -294,7 +294,7 @@
         cso.payStatus,
         cso.orderSubmitType,
         cso.splitFlag,
-        cso.useBalanceFlag,
+        ifnull(cso.useBalanceFlag, 0) as useBalanceFlag,
         ifnull(cso.sendOutStatus, 1) as sendOutStatus,
         (select onlinePayFlag from cm_order where orderId = cso.orderId ) as onlinePay,
         (select secondHandOrderFlag from cm_order where orderId = cso.orderId ) as secondHandOrderFlag,
@@ -419,7 +419,7 @@
         cso.productAmount,
         cso.needPayAmount,
         cso.shopProductAmount,
-        cso.shopPostFee,
+        ifnull(cso.shopPostFee, 0) as shopPostFee,
         IFNULL(cso.shopPostFlag, 0) AS shopPostFlag,
         cso.shopTaxFee,
         cso.shouldPayShopAmount,
@@ -428,7 +428,7 @@
         cso.payStatus,
         cso.orderSubmitType,
         cso.splitFlag,
-        cso.useBalanceFlag,
+        ifnull(cso.useBalanceFlag, 0) as useBalanceFlag,
         ifnull(cso.sendOutStatus, 1) as sendOutStatus,
         (select onlinePayFlag from cm_order where orderId = cso.orderId ) as onlinePay,
         (select secondHandOrderFlag from cm_order where orderId = cso.orderId ) as secondHandOrderFlag,

src/main/resources/mapper/ShipMapper.xml

@@ -116,8 +116,8 @@
             a.productAmount,
             a.needPayAmount,
             a.shopProductAmount,
-            a.shopPostFee,
-            a.shopTaxFee,
+            ifnull(a.shopPostFee, 0) as shopPostFee,
+            ifnull(a.shopTaxFee, 0) as shopTaxFee,
             IFNULL(a.shopPostFlag, 0) AS shopPostFlag,
             a.shouldPayShopAmount,
             a.payedShopAmount,
@@ -131,7 +131,7 @@
             ifnull(s.payway, 0) AS payway,
             a.shopStatus as status,
             a.splitFlag,
-            a.useBalanceFlag
+            ifnull(a.useBalanceFlag, 0) as useBalanceFlag
         FROM cm_shop_order a
         LEFT JOIN bp_order_userinfo ou ON  ou.orderId=a.orderId
         LEFT JOIN cm_order o ON a.orderID=o.orderID
@@ -247,7 +247,7 @@
             cso.productAmount,
             cso.needPayAmount,
             cso.shopProductAmount,
-            cso.shopPostFee,
+            ifnull(cso.shopPostFee, 0) as shopPostFee,
             IFNULL(cso.shopPostFlag, 0) AS shopPostFlag,
             cso.shopTaxFee,
             cso.shouldPayShopAmount,
@@ -264,7 +264,7 @@
             ifnull(s.payway, 0) AS payway,
             cso.shopStatus as status,
             cso.splitFlag,
-            cso.useBalanceFlag
+            ifnull(cso.useBalanceFlag, 0) as useBalanceFlag
         FROM cm_shop_order cso
                  LEFT JOIN shop s ON cso.shopID = s.shopID
         WHERE cso.shopOrderID = #{shopOrderId} AND cso.delFlag = '0'