线下收款小程序

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

@@ -254,7 +254,7 @@ public class ReceiptApi {
             @ApiImplicitParam(required = false, name = "pageSize", value = "每页数量")
     })
     @GetMapping("/detail/orders")
-    public ResponseJson<PageInfo<OrderVo>> getReceiptOrderList(Integer id, Integer type, Integer organizeId, String orderReceiptStatus, String keyword,
+    public ResponseJson<PageInfo<ShopOrderVo>> getReceiptOrderList(Integer id, Integer type, Integer organizeId, String orderReceiptStatus, String keyword,
                                                                @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
                                                                @RequestParam(value = "pageSize", defaultValue = "10") int pageSize,
                                                                @RequestHeader HttpHeaders headers) {
@@ -266,10 +266,10 @@ public class ReceiptApi {
      * crm:/api/user/receivables/orderDetail
      */
     @ApiOperation("收款详情-订单详情")
-    @ApiImplicitParam(required = false, name = "orderId", value = "订单ID")
+    @ApiImplicitParam(required = false, name = "shopOrderId", value = "子订单ID")
     @GetMapping("/detail/orders/info")
-    public ResponseJson<OrderVo> getReceiptOrderInfo(Integer orderId, @RequestHeader HttpHeaders headers) {
-        return receiptService.getReceiptOrderInfo(orderId, headers);
+    public ResponseJson<ShopOrderVo> getReceiptOrderInfo(Integer shopOrderId, @RequestHeader HttpHeaders headers) {
+        return receiptService.getReceiptOrderInfo(shopOrderId, headers);
     }
 
     /**
@@ -298,10 +298,10 @@ public class ReceiptApi {
      * crm:/api/user/rebate/orderInfo
      */
     @ApiOperation("供应商退款-订单详情")
-    @ApiImplicitParam(required = false, name = "orderId", value = "订单ID")
+    @ApiImplicitParam(required = false, name = "shopOrderId", value = "子订单ID")
     @GetMapping("/refund/orders/info")
-    public ResponseJson<OrderVo> getRefundShopOrderInfo(Integer orderId, @RequestHeader HttpHeaders headers) {
-        return receiptService.getRefundShopOrderInfo(orderId, headers);
+    public ResponseJson<ShopOrderVo> getRefundShopOrderInfo(Integer shopOrderId, @RequestHeader HttpHeaders headers) {
+        return receiptService.getRefundShopOrderInfo(shopOrderId, headers);
     }
 
     /**

src/main/java/com/caimei365/order/mapper/BaseMapper.java

@@ -88,6 +88,13 @@ public interface BaseMapper {
      */
     String getUserNameByUserId(Integer userId);
 
+    /**
+     * 根据用户Id查询名称
+     * @param userId
+     * @return
+     */
+    String getNameByUserId(Integer userId);
+
     /**
      * 根据用户Id查询手机号
      */

src/main/java/com/caimei365/order/mapper/OrderClubMapper.java

@@ -340,11 +340,20 @@ public interface OrderClubMapper {
 
     List<Integer> getProductOrder(Integer orderId);
 
+    List<Integer> getProductShopOrder(Integer shopOrderId);
+
     /**
      * 根据orderId查询商品名称
      */
     List<String> getOrderIds(Integer orderId);
 
+    /**
+     * 根据shopOrderId查询商品名称
+     * @param shopOrderId
+     * @return
+     */
+    List<String> getShopOrderIds(Integer shopOrderId);
+
     /**
      * 根据orderId查询订单金额
      */
@@ -375,6 +384,13 @@ public interface OrderClubMapper {
      */
     String getOrderNo(Integer orderId);
 
+    /**
+     * 根据shopOrderId查询商品编号
+     * @param shopOrderId
+     * @return
+     */
+    String getShopOrderNo(Integer shopOrderId);
+
     OrderVo getOrderMess(Integer orderId);
 
     OrderVo getcartNess(Integer userId);

src/main/java/com/caimei365/order/mapper/PayOrderMapper.java

@@ -44,6 +44,12 @@ public interface PayOrderMapper {
      * @param order 主订单
      */
     void updateOrderStatus(OrderVo order);
+
+    /**
+     * 更新子订单状态
+     * @param shopOrderVo 子订单
+     */
+    void updateShopOrderStatus(ShopOrderVo shopOrderVo);
     /**
      * 根据用户Id更新余额
      * @param userMoney      用户余额

src/main/java/com/caimei365/order/mapper/ReceiptMapper.java

@@ -77,27 +77,27 @@ public interface ReceiptMapper {
     /**
      * 获取订单已支付金额(待审核状态的收款也算)
      */
-    Double getPaidAmountByOrderId(Integer orderId);
+    Double getPaidAmountByOrderId(Integer shopOrderId);
 
     /**
      * 获取订单待审核金额
      */
-    Double getUncheckAmount(Integer orderId);
+    Double getUncheckAmount(Integer shopOrderId);
 
     /**
      * 获取订单已退金额
      */
-    Double getReturnedAmount(Integer orderId);
+    Double getReturnedAmount(Integer shopOrderId);
 
     /**
      * 获取主订单下面的所有的确认收货商品数量
      */
-    Integer getReceiptNumByOrderId(Integer orderId);
+    Integer getReceiptNumByOrderId(Integer shopOrderId);
 
     /**
      * 获取该主订单下面所有已完成状态退货退款商品数量
      */
-    Integer getReturnAndCancelNum(Integer orderId);
+    Integer getReturnAndCancelNum(Integer shopOrderId);
 
     /**
      * 获取协销Id
@@ -122,38 +122,38 @@ public interface ReceiptMapper {
     /**
      * 获取收款关联订单
      */
-    List<OrderVo> getReceiptOrders(Integer receiptId);
+    List<ShopOrderVo> getReceiptOrders(Integer receiptId);
 
-    List<OrderVo> getReceiptOrderlist(Integer receiptId);
+    List<ShopOrderVo> getReceiptOrderlist(Integer receiptId);
 
     List<OrderVo> getReceiptOrderlists(Integer receiptId);
 
     /**
      * 获取收款商品订单列表
      */
-    List<OrderVo> getOrderListByParams(ReceiptParamsBo receiptParamsBo);
+    List<ShopOrderVo> getOrderListByParams(ReceiptParamsBo receiptParamsBo);
 
-    List<OrderVo> getOrderListByOrderIds(@Param("orderIdS") String[] orderIdS);
+    List<ShopOrderVo> getOrderListByOrderIds(@Param("orderIdS") String[] orderIdS);
 
     /**
      * 存在退款中的记录
      */
-    Integer countHaveReturning(Integer orderId);
+    Integer countHaveReturning(Integer shopOrderId);
 
     /**
      * 存在收款中的记录
      */
-    Integer countHaveReceipting(Integer orderId);
+    Integer countHaveReceipting(Integer shopOrderId);
 
     /**
      * 线上支付收款Id
      */
-    Integer getOnlineReceiptId(Integer orderId);
+    Integer getOnlineReceiptId(Integer shopOrderId);
 
     /**
      * 获取已退款金额
      */
-    List<ReturnedPurchaseVo> getRefundFeeByOrderId(Integer orderId);
+    List<ReturnedPurchaseVo> getRefundFeeByOrderId(Integer shopOrderId);
 
     /**
      * 已关联子订单
@@ -251,7 +251,7 @@ public interface ReceiptMapper {
     /**
      * 查询待审核数量
      */
-    int getPendingAuditCount(Integer orderId);
+    int getPendingAuditCount(Integer shopOrderId);
 
     /**
      * 添加 返佣欠款记录

src/main/java/com/caimei365/order/model/bo/ReceiptParamsBo.java

@@ -47,6 +47,10 @@ public class ReceiptParamsBo implements Serializable {
      */
     private Integer orderId;
     private Integer excludeOrderId;
+    /**
+     * 子订单Id
+     */
+    private Integer shopOrderId;
     /**
      * 订单类型：0商品订单(默认)，1订金订单
      */

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

@@ -49,7 +49,7 @@ public class ReceiptOperateDto implements Serializable {
     /**
      * 关联订单IDS
      */
-    @ApiModelProperty("关联订单IDS")
+    @ApiModelProperty("关联子订单IDS")
     private String orderIds;
     /**
      * 关联供应商退款子订单ID

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

@@ -129,6 +129,10 @@ public class ReceiptVo implements Serializable {
      * 关联订单列表
      */
     private List<OrderVo> orderList;
+    /**
+     * 关联订单列表
+     */
+    private List<ShopOrderVo> shopOrderList;
     /**
      * 收款人
      */

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

@@ -302,6 +302,26 @@ public class ShopOrderVo implements Serializable {
      * 存在退款中的记录 （0：否，1：是）
      */
     private String haveReturning;
+    /**
+     * 存在收款中的记录 （0：否，1：是）
+     */
+    private String haveReceipting;
+    /**
+     * 剩余应收金额
+     */
+    private Double surplusAmount;
+    /**
+     * 订单状态备注
+     */
+    private String statusName;
+    /**
+     * 待审金额
+     */
+    private Double unCheckAmount;
+    /**
+     * 退货退款价值（抵扣经理折扣后）
+     */
+    private Double returnValue;
     /**
      * 子订单返佣标识
      */
@@ -378,6 +398,18 @@ public class ShopOrderVo implements Serializable {
      * 退款总金额
      */
     private Double returnedPurchaseFee;
+    /**
+     * 退款总额(给买家)
+     */
+    private Double refundFee;
+    /**
+     * 总税费
+     */
+    private Double totalAddedValueTax;
+    /**
+     * 收款详情是否可以查看
+     */
+    private Boolean authority = false;
     /**
      * 条款ID
      */

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

@@ -115,14 +115,14 @@ public interface ReceiptService {
      * @param pageNum            页码
      * @param pageSize           每页数量
      */
-    ResponseJson<PageInfo<OrderVo>> getReceiptOrderList(Integer id, Integer type, Integer organizeId, String orderReceiptStatus, String keyword, int pageNum, int pageSize, HttpHeaders headers);
+    ResponseJson<PageInfo<ShopOrderVo>> getReceiptOrderList(Integer id, Integer type, Integer organizeId, String orderReceiptStatus, String keyword, int pageNum, int pageSize, HttpHeaders headers);
 
     /**
      * 收款详情-订单详情
      *
-     * @param orderId 订单Id
+     * @param shopOrderId 子订单Id
      */
-    ResponseJson<OrderVo> getReceiptOrderInfo(Integer orderId, HttpHeaders headers);
+    ResponseJson<ShopOrderVo> getReceiptOrderInfo(Integer shopOrderId, HttpHeaders headers);
 
     /**
      * 供应商退款-子订单列表
@@ -139,9 +139,9 @@ public interface ReceiptService {
     /**
      * 供应商退款-订单详情
      *
-     * @param orderId 订单Id
+     * @param shopOrderId 子订单Id
      */
-    ResponseJson<OrderVo> getRefundShopOrderInfo(Integer orderId, HttpHeaders headers);
+    ResponseJson<ShopOrderVo> getRefundShopOrderInfo(Integer shopOrderId, HttpHeaders headers);
 
     /**
      * 返佣款-子订单列表

src/main/resources/mapper/BaseMapper.xml

@@ -94,6 +94,18 @@
         where userID = #{userId}
         LIMIT 1
     </select>
+    <select id="getNameByUserId" resultType="java.lang.String">
+        SELECT
+            (
+            CASE u.userIdentity
+            WHEN 4 THEN u.userName
+            WHEN 2 THEN c.name
+            END) AS userName
+        FROM USER u
+                 LEFT JOIN club c ON c.userId = u.userId
+        WHERE u.userID = #{userId}
+        LIMIT 1
+    </select>
     <select id="getLadderPriceList" resultType="com.caimei365.order.model.vo.LadderPriceVo">
         select id,
                productId,

src/main/resources/mapper/OrderClubMapper.xml

@@ -278,7 +278,7 @@
             co.secondHandOrderFlag as secondHandOrderFlag,
             IFNULL(cso.receiptAmount,0) AS receiptAmount,
             cso.eachDiscount,
-            IFNULL(cso.realPay, cso.needPayAmount)AS readPay,
+            IFNULL(cso.realPay, cso.needPayAmount)AS realPay,
             s.name AS shopName,
             ifnull(s.payway, 0) AS payway,
             s.logo AS shopLogo,
@@ -583,7 +583,7 @@
             s.shopType AS shopType,
             IFNULL(cso.receiptAmount,0) AS receiptAmount,
             cso.eachDiscount,
-            IFNULL(cso.realPay, cso.needPayAmount)AS readPay,
+            IFNULL(cso.realPay, cso.needPayAmount)AS realPay,
             ifnull(cso.receiptStatus, 1) as receiptStatus,
             ifnull(cso.orderStatusFlag, 1) as orderStatusFlag,
             ifnull(cso.refundStatus, 1) as refundStatus,
@@ -716,7 +716,7 @@
                         IFNULL(s.payway, 0) AS payway,
                         s.logo AS shopLogo,
                         s.shopType AS shopType,
-                        IFNULL(cso.realPay, cso.needPayAmount)AS readPay,
+                        IFNULL(cso.realPay, cso.needPayAmount)AS realPay,
                         ifnull(cso.receiptStatus, 1) as receiptStatus,
                         ifnull(cso.orderStatusFlag, 1) as orderStatusFlag,
                         ifnull(cso.refundStatus, 1) as refundStatus,
@@ -836,6 +836,11 @@
         FROM `cm_order_product`
         WHERE orderId = #{orderId}
     </select>
+    <select id="getProductShopOrder" resultType="java.lang.Integer">
+        SELECT productID
+        FROM `cm_order_product`
+        WHERE shopOrderId = #{shopOrderId}
+    </select>
 
     <select id="getOrderIds" resultType="java.lang.String">
         SELECT DISTINCT p.name
@@ -844,6 +849,12 @@
                  LEFT JOIN `cm_order` cm ON cm.orderNo = cmp.orderNo
         WHERE cmp.orderId = #{orderId}
     </select>
+    <select id="getShopOrderIds" resultType="java.lang.String">
+        SELECT DISTINCT p.name
+        FROM product p
+                 LEFT JOIN cm_order_product cmp ON p.productID = cmp.productID
+        WHERE cmp.shopOrderId = #{shopOrderId}
+    </select>
 
     <select id="getpayTotalFee" resultType="java.lang.Double">
         SELECT payTotalFee
@@ -883,6 +894,12 @@
         WHERE cmp.orderId = #{orderId}
     </select>
 
+    <select id="getShopOrderNo" resultType="java.lang.String">
+        SELECT DISTINCT shopOrderNo
+        FROM cm_shop_order
+        WHERE shopOrderId = #{shopOrderId}
+    </select>
+
     <select id="getOrderMess" resultType="com.caimei365.order.model.vo.OrderVo">
         SELECT DISTINCT p.`name`         AS proName,
                         cm.payFlag       AS payFlag,

src/main/resources/mapper/OrderCommonMapper.xml

@@ -58,7 +58,7 @@
         s.shopType as shopType,
         ifnull(cso.receiptAmount,0) as receiptAmount,
         cso.eachDiscount,
-        ifnull(cso.realPay, cso.needPayAmount) as readPay,
+        ifnull(cso.realPay, cso.needPayAmount) as realPay,
         ifnull(cso.receiptStatus, 1) as receiptStatus
         FROM cm_shop_order cso
         LEFT JOIN shop s ON cso.shopID = s.shopID
@@ -107,7 +107,7 @@
         s.shopType as shopType,
         ifnull(cso.receiptAmount,0) as receiptAmount,
         cso.eachDiscount,
-        ifnull(cso.realPay, cso.needPayAmount) as readPay,
+        ifnull(cso.realPay, cso.needPayAmount) as realPay,
         ifnull(cso.receiptStatus, 1) as receiptStatus
         FROM cm_shop_order cso
         LEFT JOIN shop s ON cso.shopID = s.shopID
@@ -210,6 +210,7 @@
                p.productType,
                p.productCode,
                p.splitCode,
+               p.mainImage as image,
                p.returnGoodsStutas
         FROM cm_order_product cop
                  LEFT JOIN product p ON cop.productID = p.productID
@@ -530,6 +531,7 @@
         cso.shopOrderID AS shopOrderId,
         cso.shopOrderNo,
         cso.orderID AS orderId,
+        cso.orderType,
         IFNULL(cso.organizeID, 0) AS organizeId,
         IFNULL(cso.isColdChina, 0) AS isColdChina,
         cso.orderNo,
@@ -568,7 +570,7 @@
         s.shopType AS shopType,
         IFNULL(cso.receiptAmount,0) AS receiptAmount,
         cso.eachDiscount,
-        IFNULL(cso.realPay, cso.needPayAmount)AS readPay,
+        IFNULL(cso.realPay, cso.needPayAmount) AS realPay,
         ifnull(cso.receiptStatus, 1) as receiptStatus,
         ifnull(cso.orderStatusFlag, 1) as orderStatusFlag,
         ifnull(cso.refundStatus, 1) as refundStatus,

src/main/resources/mapper/OrderSellerMapper.xml

@@ -140,7 +140,7 @@
         ifnull(s.payway, 0) AS payway,
         s.logo AS shopLogo,
         s.shopType AS shopType,
-        IFNULL(cso.realPay, cso.needPayAmount)AS readPay,
+        IFNULL(cso.realPay, cso.needPayAmount)AS realPay,
         ifnull(cso.receiptStatus, 1) as receiptStatus,
         ifnull(cso.orderStatusFlag, 1) as orderStatusFlag,
         ifnull(cso.refundStatus, 1) as refundStatus,
@@ -306,7 +306,7 @@
         ifnull(s.payway, 0) AS payway,
         s.logo AS shopLogo,
         s.shopType AS shopType,
-        IFNULL(cso.realPay, cso.needPayAmount)AS readPay,
+        IFNULL(cso.realPay, cso.needPayAmount)AS realPay,
         ifnull(cso.receiptStatus, 1) as receiptStatus,
         ifnull(cso.orderStatusFlag, 1) as orderStatusFlag,
         ifnull(cso.refundStatus, 1) as refundStatus,
@@ -442,7 +442,7 @@
         ifnull(s.payway, 0) AS payway,
         s.logo AS shopLogo,
         s.shopType AS shopType,
-        IFNULL(cso.realPay, cso.needPayAmount)AS readPay,
+        IFNULL(cso.realPay, cso.needPayAmount)AS realPay,
         ifnull(cso.receiptStatus, 1) as receiptStatus,
         ifnull(cso.orderStatusFlag, 1) as orderStatusFlag,
         ifnull(cso.refundStatus, 1) as refundStatus,

src/main/resources/mapper/PayOrderMapper.xml

@@ -25,6 +25,18 @@
         ,updateDate = #{updateDate}
         WHERE orderID = #{orderId}
     </update>
+    <update id="updateShopOrderStatus">
+        UPDATE cm_shop_order SET
+        shopstatus = #{status}
+        <if test="receiptStatus != null">
+            ,receiptStatus = #{receiptStatus}
+        </if>
+        <if test="payStatus != null">
+            ,payStatus = #{payStatus}
+        </if>
+        ,updateDate = #{updateDate}
+        WHERE orderID = #{orderId}
+    </update>
     <update id="updateMoneyByUserId">
         UPDATE USER
         SET userMoney     = #{userMoney},

src/main/resources/mapper/ReceiptMapper.xml

@@ -207,8 +207,8 @@
         FROM cm_receipt_order_relation cror
         LEFT JOIN cm_discern_receipt cdr ON cror.receiptID = cdr.id
         <where>
-            <if test="orderId != null and orderId != ''">
-                AND cror.orderID = #{orderId} AND cror.relationType = 2
+            <if test="shopOrderId != null">
+                AND cror.shopOrderId = #{shopOrderId} AND cror.relationType = 2
             </if>
             AND cdr.receiptStatus in(2,3)
             AND cdr.payWay != '3'
@@ -221,8 +221,8 @@
         FROM cm_receipt_order_relation cror
         LEFT JOIN cm_discern_receipt cdr ON cror.receiptID = cdr.id
         <where>
-            <if test="orderId != null and orderId != ''">
-                AND cror.orderID = #{orderId} AND cror.relationType = 2
+            <if test="shopOrderId != null">
+                AND cror.shopOrderId = #{shopOrderId} AND cror.relationType = 2
             </if>
             AND cdr.receiptStatus = '2'
             AND cdr.delFlag = '0'
@@ -232,8 +232,8 @@
     <select id="getReturnedAmount" resultType="java.lang.Double">
         SELECT IFNULL(SUM(returnedPurchaseFee), 0) FROM cm_returned_purchase
         <where>
-            <if test="orderId != null and orderId != ''">
-                AND orderID = #{orderId}
+            <if test="shopOrderId != null">
+                AND shopOrderId = #{shopOrderId}
             </if>
             AND status = '2'
         </where>
@@ -242,14 +242,14 @@
         SELECT IFNULL(SUM(a.num), 0)
         FROM cm_logistics_record a
                  LEFT JOIN cm_logistics_batch b ON a.logisticsBatchID = b.id
-        WHERE b.orderID = #{orderId}
+        WHERE b.shopOrderID = #{shopOrderId}
           AND b.status = '1'
     </select>
     <select id="getReturnAndCancelNum" resultType="java.lang.Integer">
         SELECT IFNULL(SUM(a.actualReturnedNum + a.actualCancelNum), 0)
         FROM cm_returned_purchase_product a
                  LEFT JOIN cm_returned_purchase b ON a.returnedID = b.id
-        WHERE b.orderID = #{orderId}
+        WHERE b.shopOrderId = #{shopOrderId}
           AND b.status = '2'
           AND b.delFlag = '0'
     </select>
@@ -414,130 +414,119 @@
         WHERE cdr.delFlag = '0'
           AND cdr.id = #{id}
     </select>
-    <select id="getReceiptOrders" resultType="com.caimei365.order.model.vo.OrderVo">
-        SELECT IFNULL(o.orderSeen, 0) AS orderSeen,
-               o.orderID              AS orderId,
-               o.shopOrderIds,
-               o.orderSource,
-               o.orderNo,
-               o.userID               AS userId,
-               o.clubID               AS clubId,
-               o.organizeID           AS organizeId,
-               o.buyUserID            AS buyUserId,
-               o.orderTime            AS orderTime,
-               o.updateDate           AS updateDate,
-               o.delFlag,
-               o.userBeans,
-               o.orderType,
-               o.orderSubmitType,
-               o.confirmFlag,
-               o.onlinePayFlag,
-               o.splitFlag,
-               o.payFlag,
-               o.receiptStatus,
-               o.payStatus,
-               o.zeroCostFlag,
-               o.sendOutStatus,
-               o.refundType,
-               o.affirmPaymentFlag,
-               o.productCount,
-               o.presentCount,
-               o.promotionalGiftsCount,
-               o.hasActProduct,
-               o.promotionFullReduction,
-               o.svipFullReduction,
-               o.secondHandOrderFlag,
-               o.invoiceFlag,
-               o.freePostFlag         AS postageFlag,
-               o.freight              AS postage,
-               o.productTotalFee,
-               o.orderTotalFee,
-               o.payTotalFee,
-               o.payableAmount,
-               o.balancePayFee,
-               o.discountFee,
-               o.couponAmount,
-               o.status,
-               o.confirmTime,
-               o.payTime,
-               o.rebateFlag,
-               o.clauseID             AS clauseId,
-               o.clauseName,
+    <select id="getReceiptOrders" resultType="com.caimei365.order.model.vo.ShopOrderVo">
+        SELECT cso.shopOrderID AS shopOrderId,
+               cso.shopOrderNo,
+               cso.orderID AS orderId,
+               cso.orderType,
+               IFNULL(cso.organizeID, 0) AS organizeId,
+               IFNULL(cso.isColdChina, 0) AS isColdChina,
+               cso.orderNo,
+               cso.shopID AS shopId,
+               cso.note,
+               cso.userID AS userId,
+               (SELECT clubID FROM cm_order WHERE orderId = cso.orderId ) AS clubId,
+               cso.spID AS spId,
+               IFNULL(cso.presentNum, 0) AS presentNum,
+               cso.orderPromotionsId,
+               cso.promotionFullReduction,
+               cso.svipShopReduction,
+               cso.brokerage,
+               cso.canRefundAmount,
+               cso.itemCount,
+               cso.totalAmount,
+               cso.productAmount,
+               cso.needPayAmount,
+               cso.shopProductAmount,
+               IFNULL(cso.shopPostFee, 0) AS shopPostFee,
+               IFNULL(cso.shopPostFlag, 0) AS shopPostFlag,
+               cso.shopTaxFee,
+               cso.shouldPayShopAmount,
+               (SELECT userBeans FROM cm_order WHERE orderId = cso.orderId ) AS userBeans,
+               cso.orderTime,
+               cso.payStatus,
+               cso.orderSubmitType,
+               cso.splitFlag,
+               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,
+               IFNULL(cso.receiptAmount,0) AS receiptAmount,
+               cso.eachDiscount,
+               IFNULL(cso.realPay, cso.needPayAmount)AS realPay,
+               IFNULL(cso.receiptStatus, 1) AS receiptStatus,
+               IFNULL(cso.orderStatusFlag, 1) AS orderStatusFlag,
+               IFNULL(cso.refundStatus, 1) AS refundStatus,
+               cso.shopStatus AS STATUS,
                IFNULL(u.userName, '') AS userName
-        FROM cm_order o
-                 INNER JOIN cm_receipt_order_relation cror ON o.orderID = cror.orderID
+        FROM cm_shop_order cso
+                 INNER JOIN cm_receipt_order_relation cror ON cso.shopOrderId = cror.shopOrderId
                  INNER JOIN cm_discern_receipt cdr ON cror.receiptID = cdr.id
-                 LEFT JOIN USER u ON o.userID = u.userID
+                 LEFT JOIN USER u ON cso.userID = u.userID
         WHERE cdr.id = #{receiptId}
-          AND o.delFlag = '0'
+          AND cso.delFlag = '0'
           AND cror.delFlag = '0'
           AND cdr.delFlag = '0'
-        ORDER BY o.orderTime DESC
+        ORDER BY cso.orderTime DESC
     </select>
 
-    <select id="getReceiptOrderlist" resultType="com.caimei365.order.model.vo.OrderVo">
-        SELECT IFNULL(o.orderSeen, 0) AS orderSeen,
-               o.orderID              AS orderId,
-               o.shopOrderIds,
-               o.orderSource,
-               o.orderNo,
-               o.userID               AS userId,
-               o.clubID               AS clubId,
-               o.organizeID           AS organizeId,
-               o.buyUserID            AS buyUserId,
-               o.orderTime            AS orderTime,
-               o.updateDate           AS updateDate,
-               o.delFlag,
-               o.userBeans,
-               o.orderType,
-               o.orderSubmitType,
-               o.confirmFlag,
-               o.onlinePayFlag,
-               o.splitFlag,
-               o.payFlag,
-               o.receiptStatus,
-               o.payStatus,
-               o.zeroCostFlag,
-               o.sendOutStatus,
-               o.refundType,
-               o.affirmPaymentFlag,
-               o.productCount,
-               o.presentCount,
-               o.promotionalGiftsCount,
-               o.hasActProduct,
-               o.promotionFullReduction,
-               o.svipFullReduction,
-               o.secondHandOrderFlag,
-               o.invoiceFlag,
-               o.freePostFlag         AS postageFlag,
-               o.freight              AS postage,
-               o.productTotalFee,
-               o.orderTotalFee,
-               o.payTotalFee,
-               o.payableAmount,
-               o.balancePayFee,
-               o.discountFee,
-               o.couponAmount,
-               o.status,
-               o.confirmTime,
-               o.payTime,
-               o.rebateFlag,
-               o.clauseID             AS clauseId,
-               o.clauseName,
+    <select id="getReceiptOrderlist" resultType="com.caimei365.order.model.vo.ShopOrderVo">
+        SELECT cso.shopOrderID AS shopOrderId,
+               cso.shopOrderNo,
+               cso.orderID AS orderId,
+               cso.orderType,
+               IFNULL(cso.organizeID, 0) AS organizeId,
+               IFNULL(cso.isColdChina, 0) AS isColdChina,
+               cso.orderNo,
+               cso.shopID AS shopId,
+               cso.note,
+               cso.userID AS userId,
+               (SELECT clubID FROM cm_order WHERE orderId = cso.orderId ) AS clubId,
+               cso.spID AS spId,
+               IFNULL(cso.presentNum, 0) AS presentNum,
+               cso.orderPromotionsId,
+               cso.promotionFullReduction,
+               cso.svipShopReduction,
+               cso.brokerage,
+               cso.canRefundAmount,
+               cso.itemCount,
+               cso.totalAmount,
+               cso.productAmount,
+               cso.needPayAmount,
+               cso.shopProductAmount,
+               IFNULL(cso.shopPostFee, 0) AS shopPostFee,
+               IFNULL(cso.shopPostFlag, 0) AS shopPostFlag,
+               cso.shopTaxFee,
+               cso.shouldPayShopAmount,
+               (SELECT userBeans FROM cm_order WHERE orderId = cso.orderId ) AS userBeans,
+               cso.orderTime,
+               cso.payStatus,
+               cso.orderSubmitType,
+               cso.splitFlag,
+               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,
+               IFNULL(cso.receiptAmount,0) AS receiptAmount,
+               cso.eachDiscount,
+               IFNULL(cso.realPay, cso.needPayAmount)AS realPay,
+               IFNULL(cso.receiptStatus, 1) AS receiptStatus,
+               IFNULL(cso.orderStatusFlag, 1) AS orderStatusFlag,
+               IFNULL(cso.refundStatus, 1) AS refundStatus,
+               cso.shopStatus AS STATUS,
                IFNULL(u.userName, '') AS userName,
                cdr.newReceiptType,
                cdr.shopName
 
-        FROM cm_shop_order cms
-                 INNER JOIN cm_order o ON cms.orderID = o.orderID
-                 INNER JOIN cm_discern_receipt cdr ON cms.shopOrderID = cdr.shopOrderID
-                 LEFT JOIN USER u ON o.userID = u.userID
-                 LEFT JOIN shop s ON s.shopID = cms.shopID
+        FROM cm_shop_order cso
+                 INNER JOIN cm_discern_receipt cdr ON cso.shopOrderID = cdr.shopOrderID
+                 LEFT JOIN USER u ON cso.userID = u.userID
+                 LEFT JOIN shop s ON s.shopID = cso.shopID
         WHERE cdr.id = #{receiptId}
-          AND o.delFlag = '0'
-          AND cms.delFlag = '0'
+          AND cso.delFlag = '0'
+          AND cso.delFlag = '0'
           AND cdr.delFlag = '0'
-        ORDER BY o.orderTime DESC
+        ORDER BY cso.orderTime DESC
     </select>
 
     <select id="getReceiptOrderlists" resultType="com.caimei365.order.model.vo.OrderVo">
@@ -550,56 +539,55 @@
     </select>
 
 
-    <select id="getOrderListByParams" resultType="com.caimei365.order.model.vo.OrderVo">
+    <select id="getOrderListByParams" resultType="com.caimei365.order.model.vo.ShopOrderVo">
         SELECT DISTINCT
-        IFNULL(o.orderSeen,0) AS orderSeen,
-        o.orderID AS orderId,
-        o.shopOrderIds,
-        o.orderSource,
-        o.orderNo,
-        o.userID AS userId,
-        o.clubID AS clubId,
-        o.organizeID AS organizeId,
-        o.buyUserID AS buyUserId,
-        o.orderTime AS orderTime,
-        o.updateDate AS updateDate,
-        o.delFlag,
-        o.userBeans,
-        o.orderType,
-        o.orderSubmitType,
-        o.confirmFlag,
-        o.onlinePayFlag,
-        o.splitFlag,
-        o.payFlag,
-        o.receiptStatus,
-        o.payStatus,
-        o.zeroCostFlag,
-        o.sendOutStatus,
-        o.refundType,
-        o.affirmPaymentFlag,
-        o.productCount,
-        o.presentCount,
-        o.promotionalGiftsCount,
-        o.hasActProduct,
-        o.promotionFullReduction,
-        o.svipFullReduction,
-        o.secondHandOrderFlag,
-        o.invoiceFlag,
-        o.freePostFlag AS postageFlag,
-        o.freight AS postage,
-        o.productTotalFee,
-        o.orderTotalFee,
-        o.payTotalFee,
-        o.payableAmount,
-        o.balancePayFee,
-        o.discountFee,
-        o.couponAmount,
-        o.status,
-        o.confirmTime,
-        o.payTime,
-        o.rebateFlag,
-        o.clauseID AS clauseId,
-        o.clauseName,
+        cso.shopOrderID AS shopOrderId,
+        cso.shopOrderNo,
+        cso.orderID AS orderId,
+        cso.orderType,
+        IFNULL(cso.organizeID, 0) AS organizeId,
+        IFNULL(cso.isColdChina, 0) AS isColdChina,
+        cso.orderNo,
+        cso.shopID AS shopId,
+        cso.note,
+        cso.userID AS userId,
+        (SELECT clubID FROM cm_order WHERE orderId = cso.orderId ) AS clubId,
+        cso.spID AS spId,
+        IFNULL(cso.presentNum, 0) AS presentNum,
+        cso.orderPromotionsId,
+        cso.promotionFullReduction,
+        cso.svipShopReduction,
+        cso.brokerage,
+        cso.canRefundAmount,
+        cso.itemCount,
+        cso.totalAmount,
+        cso.productAmount,
+        cso.needPayAmount,
+        cso.shopProductAmount,
+        IFNULL(cso.shopPostFee, 0) AS shopPostFee,
+        IFNULL(cso.shopPostFlag, 0) AS shopPostFlag,
+        cso.shopTaxFee,
+        cso.shouldPayShopAmount,
+        (SELECT userBeans FROM cm_order WHERE orderId = cso.orderId ) AS userBeans,
+        cso.orderTime,
+        cso.payStatus,
+        cso.orderSubmitType,
+        cso.splitFlag,
+        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,
+        IFNULL(cso.receiptAmount,0) AS receiptAmount,
+        cso.eachDiscount,
+        s.name AS shopName,
+        IFNULL(s.payway, 0) AS payway,
+        s.logo AS shopLogo,
+        s.shopType AS shopType,
+        IFNULL(cso.realPay, cso.needPayAmount)AS realPay,
+        IFNULL(cso.receiptStatus, 1) AS receiptStatus,
+        IFNULL(cso.orderStatusFlag, 1) AS orderStatusFlag,
+        IFNULL(cso.refundStatus, 1) AS refundStatus,
+        cso.shopStatus AS STATUS,
         <if test="organizeId == 0 or organizeId == null">
             IFNULL(u.userName, u.name) AS userName,
         </if>
@@ -608,28 +596,31 @@
         </if>
         '0' AS haveReturning,
         '0' AS haveReceipting
-        FROM cm_order o
-        LEFT JOIN user u ON o.userID = u.userID
-        LEFT JOIN cm_order_product cop ON o.orderID = cop.orderID
+        FROM cm_shop_order cso
+        LEFT JOIN USER u ON cso.userID = u.userID
+        LEFT JOIN shop s ON cso.shopID = s.shopID
+        LEFT JOIN cm_order_product cop ON cso.shopOrderId = cop.shopOrderId
         <where>
-            <if test="excludeOrderId != null">
-                AND o.orderID != #{excludeOrderId}
+            cso.delFlag = '0' and ( s.AccountOwnership = 0 or s.bankAccount is null)
+            <if test="organizeId == 0">
+                AND cso.organizeID = 0
+            </if>
+            <if test="organizeId != 0">
+                AND cso.organizeID != 0 AND cso.organizeID != 1
             </if>
-            <if test="orderId != null">
-                AND o.orderID = #{orderId}
+            <if test="shopOrderId != null">
+                AND cso.shopOrderId = #{shopOrderId}
             </if>
-            AND o.delFlag = '0'
-            AND o.organizeID = #{organizeId}
-            AND o.receiptStatus IN
+            AND cso.receiptStatus IN
             <foreach collection="receiptStatusArr" open="(" close=")" item="receiptStatus" separator=",">
                 #{receiptStatus}
             </foreach>
-            AND o.status IN
+            AND cso.shopStatus IN
             <foreach collection="orderStatusList" open="(" close=")" item="status" separator=",">
                 #{status}
             </foreach>
             <if test="userIds != null and userIds.size() > 0">
-                AND o.userID IN
+                AND cso.userID IN
                 <foreach collection="userIds" open="(" close=")" separator="," item="val">
                     #{val}
                 </foreach>
@@ -638,7 +629,7 @@
                 AND (u.userName LIKE CONCAT('%',#{userName},'%') OR u.name LIKE CONCAT('%',#{userName},'%'))
             </if>
             #不显示返佣，普通订单含返佣服务费显示
-            AND o.rebateFlag != 1
+            # AND o.rebateFlag != 1
             <if test="orderType == null or orderType == 0">
                 AND cop.productID NOT IN(6060, 6061, 6062, 6063, 6064,6065, 6066, 6067, 6068, 6069)
             </if>
@@ -646,74 +637,63 @@
                 AND cop.productID IN(6060, 6061, 6062, 6063, 6064,6065, 6066, 6067, 6068, 6069)
             </if>
         </where>
-        <if test="orderId != null and orderId != ''">
-            ORDER BY (CASE WHEN o.orderID=#{orderId} THEN 1 ELSE 2 END),o.orderTime DESC
-        </if>
-        <if test="orderId == null or orderId == ''">
-            ORDER BY o.orderTime DESC
-        </if>
+            ORDER BY cso.orderTime desc
     </select>
-    <select id="getOrderListByOrderIds" resultType="com.caimei365.order.model.vo.OrderVo">
+    <select id="getOrderListByOrderIds" resultType="com.caimei365.order.model.vo.ShopOrderVo">
         SELECT DISTINCT
-        IFNULL(o.orderSeen,0) AS orderSeen,
-        o.orderID AS orderId,
-        o.shopOrderIds,
-        o.orderSource,
-        o.orderNo,
-        o.userID AS userId,
-        o.clubID AS clubId,
-        o.organizeID AS organizeId,
-        o.buyUserID AS buyUserId,
-        o.orderTime AS orderTime,
-        o.updateDate AS updateDate,
-        o.delFlag,
-        o.userBeans,
-        o.orderType,
-        o.orderSubmitType,
-        o.confirmFlag,
-        o.onlinePayFlag,
-        o.splitFlag,
-        o.payFlag,
-        o.receiptStatus,
-        o.payStatus,
-        o.zeroCostFlag,
-        o.sendOutStatus,
-        o.refundType,
-        o.affirmPaymentFlag,
-        o.productCount,
-        o.presentCount,
-        o.promotionalGiftsCount,
-        o.hasActProduct,
-        o.promotionFullReduction,
-        o.svipFullReduction,
-        o.secondHandOrderFlag,
-        o.invoiceFlag,
-        o.freePostFlag AS postageFlag,
-        o.freight AS postage,
-        o.productTotalFee,
-        o.orderTotalFee,
-        o.payTotalFee,
-        o.payableAmount,
-        o.balancePayFee,
-        o.discountFee,
-        o.couponAmount,
-        o.status,
-        o.confirmTime,
-        o.payTime,
-        o.rebateFlag,
-        o.clauseID AS clauseId,
-        o.clauseName
-        FROM cm_order o
-        WHERE o.delFlag = '0' AND o.orderID IN
-        <foreach collection="orderIdS" open="(" close=")" separator="," item="orderId">
-            #{orderId}
+        cso.shopOrderID AS shopOrderId,
+        cso.shopOrderNo,
+        cso.orderID AS orderId,
+        IFNULL(cso.organizeID, 0) AS organizeId,
+        IFNULL(cso.isColdChina, 0) AS isColdChina,
+        cso.orderNo,
+        cso.shopID AS shopId,
+        cso.note,
+        cso.userID AS userId,
+        (SELECT clubID FROM cm_order WHERE orderId = cso.orderId ) AS clubId,
+        cso.spID AS spId,
+        IFNULL(cso.presentNum, 0) AS presentNum,
+        cso.orderPromotionsId,
+        cso.promotionFullReduction,
+        cso.svipShopReduction,
+        cso.brokerage,
+        cso.canRefundAmount,
+        cso.itemCount,
+        cso.totalAmount,
+        cso.productAmount,
+        cso.needPayAmount,
+        cso.shopProductAmount,
+        IFNULL(cso.shopPostFee, 0) AS shopPostFee,
+        IFNULL(cso.shopPostFlag, 0) AS shopPostFlag,
+        cso.shopTaxFee,
+        cso.shouldPayShopAmount,
+        (SELECT userBeans FROM cm_order WHERE orderId = cso.orderId ) AS userBeans,
+        cso.orderTime,
+        cso.payStatus,
+        cso.orderSubmitType,
+        cso.splitFlag,
+        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,
+        IFNULL(cso.receiptAmount,0) AS receiptAmount,
+        cso.eachDiscount,
+        IFNULL(cso.realPay, cso.needPayAmount)AS realPay,
+        IFNULL(cso.receiptStatus, 1) AS receiptStatus,
+        IFNULL(cso.orderStatusFlag, 1) AS orderStatusFlag,
+        IFNULL(cso.refundStatus, 1) AS refundStatus,
+        cso.shopStatus AS STATUS,
+        FROM cm_shop_order cso
+        WHERE cso.delFlag = '0' AND cso.shopOrderId IN
+        <foreach collection="orderIdS" open="(" close=")" separator="," item="shopOrderId">
+            #{shopOrderId}
         </foreach>
-        order by o.payableAmount, o.orderID
+        order by cso.realPay, cso.shopOrderId
     </select>
     <select id="countHaveReturning" resultType="java.lang.Integer">
         SELECT IFNULL(COUNT(id), 0)
         FROM cm_returned_purchase
-        WHERE orderID = #{orderID}
+        WHERE shopOrderId = #{shopOrderId}
           AND status = 1
           AND delFlag = 0
     </select>
@@ -721,7 +701,7 @@
         SELECT IFNULL(COUNT(cror.id), 0)
         FROM cm_receipt_order_relation cror
                  INNER JOIN cm_discern_receipt cdr ON cror.receiptID = cdr.id
-        WHERE cror.orderID = #{orderID}
+        WHERE cror.shopOrderId = #{shopOrderId}
           AND cror.delFlag = 0
           AND cdr.delFlag = 0
           AND cdr.receiptStatus = 2
@@ -730,7 +710,7 @@
         SELECT cdr.id
         FROM cm_receipt_order_relation cror
                  LEFT JOIN cm_discern_receipt cdr ON cror.receiptID = cdr.id
-        WHERE cror.orderID = #{orderId}
+        WHERE cror.shopOrderId = #{shopOrderId}
           AND cror.relationType = '2'
           AND cror.delFlag = '0'
           AND cdr.delFlag = '0'
@@ -743,7 +723,7 @@
                returnedPurchaseFee,
                refundFee
         FROM cm_returned_purchase
-        WHERE orderID = #{orderId}
+        WHERE shopOrderId = #{shopOrderId}
           AND STATUS = '2'
     </select>
     <select id="getShopOrderListByReceiptId" resultType="com.caimei365.order.model.vo.ShopOrderVo">
@@ -1050,6 +1030,7 @@
                cror.receiptId,
                cror.associateAmount,
                cror.orderId,
+               cror.shopOrderId,
                cror.delFlag,
                cror.mbOrderId,
                cror.orderRequestNo,
@@ -1063,7 +1044,7 @@
         SELECT COUNT(*)
         FROM cm_receipt_order_relation cror
                  LEFT JOIN cm_discern_receipt cdr ON cror.receiptID = cdr.id
-        WHERE cror.orderID = #{orderId}
+        WHERE cror.shopOrderId = #{shopOrderId}
           AND cror.relationType = '2'
           AND cror.delFlag = '0'
           AND cdr.delFlag = '0'