联合丽格1.0.2

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

@@ -276,7 +276,7 @@ public class ProductService {
             }
             // 只有冷链费商品 运费为0
             if (1 == (Integer) postageMap.get("designatedFlag")) {
-                postage = 15.00d;
+                postage = 0d;
             }
             postageMap.put("postageFlag", postageFlag);
             postageMap.put("postage", postage);

src/main/java/com/caimei365/order/model/dto/SettlementDto.java

@@ -71,7 +71,7 @@ public class SettlementDto {
      * 已付款金额
      */
     @ExcelProperty(value = "已结算金额", index = 11)
-    private Double payedShopAmount;
+    private Double settleAmount;
     /**
      * 未结算金额
      */

src/main/java/com/caimei365/order/model/vo/SettlementVo.java

@@ -35,10 +35,10 @@ public class SettlementVo {
      */
     private String name;
     /**
-     * (付款供应商)付款状态：1待付款、2部分付款、3已付款
+     * 1 未结算 2 部分结算 3 已结算
      */
     @ExcelProperty(value = "结算状态", index = 9)
-    private Integer payStatus;
+    private Integer settlestatus;
     /**
      * 订单金额
      */
@@ -70,10 +70,10 @@ public class SettlementVo {
     @ExcelProperty(value = "付供应商", index = 10)
     private Double shouldPayShopAmount;
     /**
-     * 已付款金额
+     * 已结算金额
      */
-    @ExcelProperty(value = "已付款金额", index = 11)
-    private Double payedShopAmount;
+    @ExcelProperty(value = "已结算金额", index = 11)
+    private Double settleAmount;
     /**
      * 订单商品信息
      */

src/main/java/com/caimei365/order/model/vo/ShopOrderVo.java

@@ -66,6 +66,10 @@ public class ShopOrderVo implements Serializable {
      * 协销联系人
      */
     private String serviceName;
+    /**
+     * 结算状态 1未结算2部分结算3已结算
+     */
+    private Integer settlestatus;
     /**
      * vip
      */

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

@@ -1167,9 +1167,11 @@ public class CartClubServiceImpl implements CartClubService {
                         // 总费用 + 冷链费
                         // shopPrice.set(MathUtil.add(shopPrice.get(), coldChain).doubleValue());
                         // 只有冷链费商品 运费为0
-                        if (1 == shop.getDesignatedFlag()) {
-                            shop.setPostage(0d);
-                        }
+                        /*if (null != townId) {
+                            if (1 == shop.getDesignatedFlag()) {
+                                shop.setPostage(0d);
+                            }
+                        }*/
                         // 总运费
                         shop.setAllPostage(MathUtil.add(shop.getPostage(),coldChain).doubleValue());
                         // 供应商总金额
@@ -1612,9 +1614,11 @@ public class CartClubServiceImpl implements CartClubService {
                         // 总费用 + 冷链费
                         // shopPrice.set(MathUtil.add(shopPrice.get(), coldChain).doubleValue());
                         // 只有冷链费商品 运费为0
-                        if (1 == shop.getDesignatedFlag()) {
-                            shop.setPostage(0d);
-                        }
+                        /*if (null != townId) {
+                            if (1 == shop.getDesignatedFlag()) {
+                                shop.setPostage(0d);
+                            }
+                        }*/
                         // 总运费
                         shop.setAllPostage(MathUtil.add(shop.getPostage(),coldChain).doubleValue());
                         // 供应商总金额
@@ -1997,9 +2001,11 @@ public class CartClubServiceImpl implements CartClubService {
             shop.setColdChain(coldChain);
         }
         // 只有冷链费商品 运费为0
-        if (1 == shop.getDesignatedFlag()) {
-            shop.setPostage(0d);
-        }
+        /*if (null != cartDto.getTownId()) {
+            if (1 == shop.getDesignatedFlag()) {
+                shop.setPostage(0d);
+            }
+        }*/
         // 总运费
         shop.setAllPostage(MathUtil.add(shop.getPostage(),coldChain).doubleValue());
         // 供应商总金额

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

@@ -619,9 +619,11 @@ public class CartSellerServiceImpl implements CartSellerService {
                         shop.setIsColdChina(false);
                     }
                     // 只有冷链费商品 运费为0
-                    if (1 == shop.getDesignatedFlag()) {
-                        shop.setPostage(0d);
-                    }
+                    /*if (null != townId) {
+                        if (1 == shop.getDesignatedFlag()) {
+                            shop.setPostage(0d);
+                        }
+                    }*/
                     // 总运费
                     shop.setAllPostage(MathUtil.add(shop.getPostage(),coldChain.get()).doubleValue());
                     // 供应商总金额

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

@@ -295,16 +295,16 @@ public class ShipServiceImpl implements ShipService {
             lementDto.setRefundAmount(settlement.getRefundAmount());
             lementDto.setPaymentCommission(settlement.getPaymentCommission());
             lementDto.setProrateCommission(settlement.getProrateCommission());
-            if (1 == settlement.getPayStatus()) {
-                lementDto.setPayStatus("待付款");
-            } else if (2 == settlement.getPayStatus()){
-                lementDto.setPayStatus("部分付款");
+            if (1 == settlement.getSettlestatus()) {
+                lementDto.setPayStatus("未结算");
+            } else if (2 == settlement.getSettlestatus()){
+                lementDto.setPayStatus("部分结算");
             } else {
-                lementDto.setPayStatus("已付款");
+                lementDto.setPayStatus("已结算");
             }
             lementDto.setShouldPayShopAmount(settlement.getShouldPayShopAmount());
-            lementDto.setPayedShopAmount(settlement.getPayedShopAmount());
-            lementDto.setUnsettledAmount(MathUtil.sub(settlement.getShouldPayShopAmount(), settlement.getPayedShopAmount()).doubleValue());
+            lementDto.setSettleAmount(settlement.getSettleAmount());
+            lementDto.setUnsettledAmount(MathUtil.sub(settlement.getShouldPayShopAmount(), settlement.getSettleAmount()).doubleValue());
             settlementDtoList.add(lementDto);
         });
         return settlementDtoList;
@@ -1222,6 +1222,8 @@ public class ShipServiceImpl implements ShipService {
         if (amount > wait) {
             return ResponseJson.error("支付金额大于待付!");
         }
+        // 修改cm_order状态
+        Integer orderId = shipMapper.getOrderId(shopOrderId);
         ReceiptVo receiptVo = new ReceiptVo();
         // 31 线下凭证
         receiptVo.setPayType(31);
@@ -1236,6 +1238,7 @@ public class ShipServiceImpl implements ShipService {
         record.setRelationType(2);
         record.setReceiptId(receiptVo.getId());
         record.setShopOrderId(shopOrderId);
+        record.setOrderId(orderId);
         shipMapper.insertOrderRelation(record);
         // 根据金额修改cm_Shop_order状态
         Integer status = 2;
@@ -1243,8 +1246,6 @@ public class ShipServiceImpl implements ShipService {
             status = 3;
         }
         shipMapper.updateReceiptStatus(status, shopOrderId);
-        // 修改cm_order状态
-        Integer orderId = shipMapper.getOrderId(shopOrderId);
         // 获取订单下子订单收款状态
         List<Integer> receiptStatus = shipMapper.getReceiptStatus(orderId);
         Integer sta = 1;

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

@@ -1479,6 +1479,7 @@ public class SubmitServiceImpl implements SubmitService {
             /*
              * 保存子订单
              */
+            log.info("shopOrderStatus======"+shopOrder.getShopStatus());
             submitMapper.insertShopOrder(shopOrder);
             log.info("【提交订单】>>>>>>>>>>>>>>>>>>>>>>>>>>新增子订单(insert[cm_shop_order])shopOrderId：" + shopOrder.getShopOrderId() + "，orderId：" + mainOrder.getOrderId());
             // 收集子订单Id字符串

src/main/resources/mapper/BaseMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.caimei365.order.mapper.BaseMapper">
     <select id="getOrganizeId" resultType="java.lang.Integer">
-        SELECT userOrganizeID
+        SELECT ifnull(userOrganizeID, 0) as userOrganizeID
         FROM USER
         WHERE userId = #{userId}
     </select>

src/main/resources/mapper/ShipMapper.xml

@@ -126,6 +126,7 @@
             a.orderTime,
             a.orderSubmitType,
             a.payStatus,
+            a.settlestatus,
             ifnull(a.sendOutStatus, 1) as sendOutStatus,
             ifnull(a.receiptStatus, 1) as receiptStatus,
             a.refundStatus,
@@ -182,14 +183,16 @@
             so.shopOrderNo,
             so.shopOrderID AS shopOrderId,
             so.orderTime,
+            so.settlestatus,
             user.userName AS name,
-            so.payStatus,
             IFNULL(so.shouldPayShopAmount, 0) AS shouldPayShopAmount,
             so.payedShopAmount,
+            ifnull(csr.settleAmount, 0) as settleAmount,
             so.totalAmount,
             so.refundStatus,
             IFNULL(so.refundAmount, 0) AS refundAmount
         FROM cm_shop_order so
+        LEFT JOIN cm_settle_record csr ON so.shopOrderId = csr.shopOrderId
         LEFT JOIN USER ON user.userID = so.userID
         <where>
             <if test="shopOrderNo != null and shopOrderNo != ''">
@@ -271,6 +274,7 @@
             cso.orderTime,
             cso.orderSubmitType,
             cso.payStatus,
+            cso.settlestatus,
             ifnull(cso.sendOutStatus, 1) as sendOutStatus,
             ifnull(cso.receiptStatus, 1) as receiptStatus,
             cso.refundStatus,
@@ -480,11 +484,13 @@
                                               receiptID,
                                               associateAmount,
                                               shopOrderId,
+                                              orderId,
                                               delFlag)
         VALUES (#{relationType},
                 #{receiptId},
                 #{receiptAmount},
                 #{shopOrderId},
+                #{orderId},
                 0)
     </insert>
     <select id="findOrderStatus" resultType="java.lang.String">

src/main/resources/mapper/SubmitMapper.xml

@@ -175,12 +175,11 @@
                price,
                unit,
                stock,
-               organizePercent,
-               shopPercent,
-               cmPercent
+               ifnull(organizePercent, 0) as organizePercent,
+               ifnull(shopPercent, 0) as shopPercent,
+               ifnull(cmPercent, 0) as cmPercent
         FROM cm_sku
         where skuId = #{skuId}
-          and organizeId = 4
     </select>
     <select id="getOrderInvoice" resultType="com.caimei365.order.model.po.InvoicePo">
         SELECT id,