|
|
@@ -76,10 +76,10 @@
|
|
|
<if test="name !=null and name!=''">
|
|
|
name = #{name},
|
|
|
</if>
|
|
|
- <if test="totalAmount !=null">
|
|
|
+ <if test="totalAmount != null">
|
|
|
totalAmount = #{totalAmount},
|
|
|
</if>
|
|
|
- <if test="payType !=null">
|
|
|
+ <if test="payType != null">
|
|
|
payType = #{payType},
|
|
|
</if>
|
|
|
<if test="applicant !=null">
|
|
|
@@ -235,7 +235,7 @@
|
|
|
SELECT
|
|
|
a.id AS "payShopId",
|
|
|
a.name AS "name",
|
|
|
- (a.totalAmount+a.payCmAmount) AS "totalAmount",
|
|
|
+ (ifnull(a.totalAmount,0)+ifnull(cpsr.payCmAmount,0)) AS "totalAmount",
|
|
|
a.applyTime AS "applyTime",
|
|
|
a.reviewTime AS "reviewTime",
|
|
|
a.payTime AS "payTime",
|
|
|
@@ -367,12 +367,12 @@
|
|
|
a.paying,
|
|
|
co.receiptStatus AS orderReceiptStatus,
|
|
|
bou.name as buyer,
|
|
|
- c.name as clubName
|
|
|
+ c.name as clubName
|
|
|
FROM cm_shop_order a
|
|
|
- LEFT JOIN cm_order co ON co.orderID = a.orderID
|
|
|
- LEFT JOIN shop s ON s.shopID = a.shopID
|
|
|
- left join bp_order_userinfo bou on bou.orderId = a.orderID
|
|
|
- left join club c on a.userId = c.userId
|
|
|
+ LEFT JOIN cm_order co ON co.orderID = a.orderID
|
|
|
+ LEFT JOIN shop s ON s.shopID = a.shopID
|
|
|
+ left join bp_order_userinfo bou on bou.orderId = a.orderID
|
|
|
+ left join club c on a.userId = c.userId
|
|
|
WHERE a.shopOrderID IN
|
|
|
(SELECT shoporderId
|
|
|
FROM cm_pay_shop_record
|
|
|
@@ -382,14 +382,14 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="findPayOrderProducts" resultType="com.caimei.modules.order.entity.NewOrderProduct">
|
|
|
- select cop.name AS name,
|
|
|
- cop.orderProductID AS orderProductId,
|
|
|
- cop.productID AS productId,
|
|
|
- cop.productUnit AS unit,
|
|
|
- cop.num AS num,
|
|
|
- cop.totalFee AS totalFee,
|
|
|
- cop.costPrice AS costPrice,
|
|
|
- cop.productType AS productType,
|
|
|
+ select cop.name AS name,
|
|
|
+ cop.orderProductID AS orderProductId,
|
|
|
+ cop.productID AS productId,
|
|
|
+ cop.productUnit AS unit,
|
|
|
+ cop.num AS num,
|
|
|
+ cop.totalFee AS totalFee,
|
|
|
+ cop.costPrice AS costPrice,
|
|
|
+ cop.productType AS productType,
|
|
|
cop.price,
|
|
|
cop.shopPercent,
|
|
|
cop.organizePercent,
|
|
|
@@ -400,19 +400,19 @@
|
|
|
cop.productImage,
|
|
|
(SELECT ifnull(SUM(num), 0)
|
|
|
FROM cm_logistics_record
|
|
|
- WHERE orderproductId = cop.orderproductId) as sendOutNum,
|
|
|
+ WHERE orderproductId = cop.orderproductId) as sendOutNum,
|
|
|
(SELECT IFNULL(sum(a.num), 0)
|
|
|
FROM cm_logistics_record a
|
|
|
right join cm_logistics_batch b on a.logisticsBatchID = b.id
|
|
|
WHERE a.orderProductID = #{orderProductID}
|
|
|
- and b.status = 1) as receivedNum,
|
|
|
+ and b.status = 1) as receivedNum,
|
|
|
ifnull((SELECT SUM(crpp.actualReturnedNum) + SUM(crpp.actualCancelNum)
|
|
|
FROM cm_returned_purchase_product crpp
|
|
|
LEFT JOIN cm_returned_purchase rp ON rp.id = crpp.returnedID
|
|
|
WHERE crpp.orderProductID = cop.orderProductId
|
|
|
AND rp.status = '2'
|
|
|
AND rp.delFlag = '0'),
|
|
|
- 0) AS returnedNum
|
|
|
+ 0) AS returnedNum
|
|
|
from cm_order_product cop
|
|
|
left join cm_sku cs on cop.skuId = cs.skuId
|
|
|
left join product p on p.productID = cop.productID
|
|
|
@@ -444,6 +444,7 @@
|
|
|
FROM cm_pay_shop_record a
|
|
|
LEFT JOIN cm_offline_collection f ON a.payType = f.type
|
|
|
WHERE a.payShopID = #{id}
|
|
|
+ and a.shopId != 998
|
|
|
</select>
|
|
|
|
|
|
<select id="findShopOrderNosByPayShop" resultType="java.lang.String">
|
|
|
@@ -465,7 +466,7 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="findShouldPayShopAmount" resultType="java.lang.Double">
|
|
|
- SELECT ROUND(SUM(totalAmount*shopPercent/100),2)
|
|
|
+ SELECT ROUND(SUM(totalAmount * shopPercent / 100), 2)
|
|
|
FROM cm_order_product
|
|
|
WHERE shoporderId = #{shopOrderId}
|
|
|
AND shopId != 998
|
|
|
@@ -558,22 +559,21 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="findPayShopRecordsByOrder" resultType="com.caimei.modules.order.entity.OrderPayShopRecord">
|
|
|
- SELECT DISTINCT
|
|
|
- f.bankAccount AS "bankNameType",
|
|
|
- a.id AS "id",
|
|
|
- a.shopID AS "shopId",
|
|
|
- a.shopOrderID AS "shopOrderId",
|
|
|
- a.shopOrderNo AS "shopOrderNo",
|
|
|
- a.payAmount AS "payAmount",
|
|
|
- a.payCmAmount,
|
|
|
- a.payType AS "payType",
|
|
|
- a.payTime AS "payTime",
|
|
|
- a.wipeTime AS "wipeTime",
|
|
|
- a.payShopID AS "payShopID",
|
|
|
- a.status AS "status"
|
|
|
+ SELECT DISTINCT f.bankAccount AS "bankNameType",
|
|
|
+ a.id AS "id",
|
|
|
+ a.shopID AS "shopId",
|
|
|
+ a.shopOrderID AS "shopOrderId",
|
|
|
+ a.shopOrderNo AS "shopOrderNo",
|
|
|
+ a.payAmount+a.payCmAmount AS "payAmount",
|
|
|
+ a.payCmAmount,
|
|
|
+ a.payType AS "payType",
|
|
|
+ a.payTime AS "payTime",
|
|
|
+ a.wipeTime AS "wipeTime",
|
|
|
+ a.payShopID AS "payShopID",
|
|
|
+ a.status AS "status"
|
|
|
FROM cm_pay_shop_record a
|
|
|
- LEFT JOIN cm_offline_collection f ON a.payType = f.type
|
|
|
- left join cm_pay_shop cps on a.shopID = cps.shopID
|
|
|
+ LEFT JOIN cm_offline_collection f ON a.payType = f.type
|
|
|
+ left join cm_pay_shop cps on a.shopID = cps.shopID
|
|
|
WHERE a.shopOrderID in (select shopOrderId from cm_shop_order where orderId = #{orderId})
|
|
|
and a.delFlag = 0
|
|
|
and cps.delFlag = 0
|
|
|
@@ -592,65 +592,69 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="findPayShopRecordsByShopOrder" resultType="com.caimei.modules.order.entity.OrderPayShopRecord">
|
|
|
- SELECT f.bankAccount AS "bankNameType",
|
|
|
- a.id AS "id",
|
|
|
- a.shopID AS "shopId",
|
|
|
- a.shopOrderID AS "shopOrderId",
|
|
|
- a.shopOrderNo AS "shopOrderNo",
|
|
|
- a.payAmount AS "payAmount",
|
|
|
+ SELECT distinct
|
|
|
+ f.bankAccount AS "bankNameType",
|
|
|
+ a.id AS "id",
|
|
|
+ a.shopID AS "shopId",
|
|
|
+ a.shopOrderID AS "shopOrderId",
|
|
|
+ a.shopOrderNo AS "shopOrderNo",
|
|
|
+ a.payAmount+a.payCmAmount AS "payAmount",
|
|
|
a.payCmAmount,
|
|
|
- a.payType AS "payType",
|
|
|
- a.payTime AS "payTime",
|
|
|
- a.wipeTime AS "wipeTime",
|
|
|
- a.payShopID AS "payShopID",
|
|
|
- a.status AS "status"
|
|
|
+ a.payType AS "payType",
|
|
|
+ a.payTime AS "payTime",
|
|
|
+ a.wipeTime AS "wipeTime",
|
|
|
+ a.payShopID AS "payShopID",
|
|
|
+ a.status AS "status"
|
|
|
FROM cm_pay_shop_record a
|
|
|
- LEFT JOIN cm_offline_collection f ON a.payType = f.type
|
|
|
- left join cm_pay_shop cps on a.shopID = cps.shopID
|
|
|
- WHERE a.shopOrderID in (select shopOrderId from cm_shop_order where orderId = #{shopOrderId})
|
|
|
+ LEFT JOIN cm_offline_collection f ON a.payType = f.type
|
|
|
+ left join cm_pay_shop cps on a.shopID = cps.shopID
|
|
|
+ WHERE a.shopOrderID = #{shopOrderId}
|
|
|
and a.delFlag = 0
|
|
|
and cps.delFlag = 0
|
|
|
and a.status = 1
|
|
|
and cps.status = 1
|
|
|
</select>
|
|
|
|
|
|
- <select id="findPayshOpOrderWaitPay" resultType="com.caimei.modules.order.entity.NewShopOrder">
|
|
|
- SELECT DISTINCT cso.shopOrderID AS shopOrderId,
|
|
|
- cso.orderID AS orderId,
|
|
|
- cso.organizeID AS organizeId,
|
|
|
- cso.shopOrderNo AS shopOrderNo,
|
|
|
- cso.orderNo AS orderNo,
|
|
|
+ <select id="findPayShopOrderWaitPay" resultType="com.caimei.modules.order.entity.NewShopOrder">
|
|
|
+ SELECT DISTINCT cso.shopOrderID AS shopOrderId,
|
|
|
+ cso.orderID AS orderId,
|
|
|
+ cso.organizeID AS organizeId,
|
|
|
+ cso.shopOrderNo AS shopOrderNo,
|
|
|
+ cso.orderNo AS orderNo,
|
|
|
cso.totalAmount,
|
|
|
- cso.payCmAmount AS payCmAmount,
|
|
|
- cso.receiptStatus AS receiptStatus,
|
|
|
- cso.orderTime AS orderTime,
|
|
|
- cso.payStatus AS payStatus,
|
|
|
- cso.shopProductAmount AS shopProductAmount,
|
|
|
- ifnull(cso.shopPostFee, 0) AS shopPostFee,
|
|
|
+ cso.payCmAmount AS payCmAmount,
|
|
|
+ cso.receiptStatus AS receiptStatus,
|
|
|
+ cso.orderTime AS orderTime,
|
|
|
+ cso.payStatus AS payStatus,
|
|
|
+ cso.shopProductAmount AS shopProductAmount,
|
|
|
+ ifnull(cso.shopPostFee, 0) AS shopPostFee,
|
|
|
ifnull((select sum(payAmount)
|
|
|
from cm_pay_shop_record
|
|
|
where shopOrderId = cso.shopOrderId
|
|
|
and status = 1
|
|
|
and delFlag = 0),
|
|
|
- 0) as payedShopAmount,
|
|
|
+ 0) as payedShopAmount,
|
|
|
ifnull((select sum(payCmAmount)
|
|
|
from cm_pay_shop_record
|
|
|
where shopOrderId = cso.shopOrderId
|
|
|
and status = 1
|
|
|
and delFlag = 0),
|
|
|
- 0) as payCmAmount,
|
|
|
- cso.payedShopAmount AS payedShopAmount,
|
|
|
- co.payTotalFee AS payTotalFee,
|
|
|
- s.name AS shopName,
|
|
|
+ 0) as payCmAmount,
|
|
|
+ co.payTotalFee AS payTotalFee,
|
|
|
+ s.name AS shopName,
|
|
|
s.shopId,
|
|
|
cso.paying,
|
|
|
- co.receiptStatus AS orderReceiptStatus,
|
|
|
- bou.name as buyer,
|
|
|
- c.name as clubName,
|
|
|
- cpsr.payAmount AS waitPayShop,
|
|
|
- cpsr.payCmAmount as waitPayCmAmount,
|
|
|
- (SELECT ROUND(IFNULL(SUM(num*price*cmPercent/100),0),2) FROM cm_order_product WHERE shoporderid=cso.shopOrderId) AS shouldPayCmAmount,
|
|
|
- (SELECT ROUND(IFNULL(SUM(num*price*shopPercent/100),0),2) FROM cm_order_product WHERE shoporderid=cso.shopOrderId) AS shouldPayShopAmount
|
|
|
+ co.receiptStatus AS orderReceiptStatus,
|
|
|
+ bou.name as buyer,
|
|
|
+ c.name as clubName,
|
|
|
+ cpsr.payAmount AS waitPayShop,
|
|
|
+ cpsr.payCmAmount as waitPayCmAmount,
|
|
|
+ (SELECT ROUND(IFNULL(SUM(num * price * cmPercent / 100), 0), 2)
|
|
|
+ FROM cm_order_product
|
|
|
+ WHERE shoporderid = cso.shopOrderId) AS shouldPayCmAmount,
|
|
|
+ (SELECT ROUND(IFNULL(SUM(num * price * shopPercent / 100), 0), 2)
|
|
|
+ FROM cm_order_product
|
|
|
+ WHERE shoporderid = cso.shopOrderId) AS shouldPayShopAmount
|
|
|
FROM cm_pay_shop cps
|
|
|
left join cm_pay_shop_record cpsr on cps.id = cpsr.payShopID
|
|
|
left join cm_shop_order cso on cpsr.shopOrderID = cso.shopOrderID
|
|
|
@@ -659,11 +663,47 @@
|
|
|
left join bp_order_userinfo bou on bou.orderId = co.orderID
|
|
|
left join club c on co.userId = c.userId
|
|
|
WHERE cps.id = #{payShopId}
|
|
|
- and cps.delFlag = 0
|
|
|
- and cpsr.delFlag = 0
|
|
|
+ and cps.delFlag = 0
|
|
|
+ and cpsr.delFlag = 0
|
|
|
</select>
|
|
|
|
|
|
<select id="findShopPostFee" resultType="java.lang.Double">
|
|
|
- select ifnull(shopPostFee,0) from cm_shop_order where shopOrderId = #{shopOrderId}
|
|
|
+ select ifnull(shopPostFee, 0)
|
|
|
+ from cm_shop_order
|
|
|
+ where shopOrderId = #{shopOrderId}
|
|
|
+ </select>
|
|
|
+
|
|
|
+ <select id="findShopOrderByPayShop" resultType="com.caimei.modules.order.entity.NewShopOrder">
|
|
|
+ select cso.refundStatus AS refundStatus,
|
|
|
+ ifnull(cso.shopPostFee, 0) AS shopPostFee,
|
|
|
+ cso.paying AS paying,
|
|
|
+ ifnull(cso.settleStatus, 1) as settleStatus,
|
|
|
+ ifnull(cso.receiptStatus, 1) as receiptStatus,
|
|
|
+ cso.shopOrderID AS shopOrderId,
|
|
|
+ cso.orderID AS orderId,
|
|
|
+ cso.organizeID AS organizeId,
|
|
|
+ cso.userID AS userId,
|
|
|
+ cso.shopID AS shopId,
|
|
|
+ cso.productAmount AS productAmount,
|
|
|
+ cso.totalAmount AS totalAmount,
|
|
|
+ cso.shopProductAmount AS shopProductAmount,
|
|
|
+ cso.shouldPayShopAmount AS shouldPayShopAmount,
|
|
|
+ ifnull((select sum(payAmount)
|
|
|
+ from cm_pay_shop_record
|
|
|
+ where shopOrderId = cso.shopOrderId
|
|
|
+ and status = 1
|
|
|
+ and delFlag = 0),
|
|
|
+ 0) as payedShopAmount,
|
|
|
+ ifnull((select sum(payCmAmount)
|
|
|
+ from cm_pay_shop_record
|
|
|
+ where shopOrderId = cso.shopOrderId
|
|
|
+ and status = 1
|
|
|
+ and delFlag = 0),
|
|
|
+ 0) as payCmAmount
|
|
|
+ from cm_pay_shop cps
|
|
|
+ left join cm_pay_shop_record cpsr on cps.id = cpsr.payShopID
|
|
|
+ left join cm_shop_order cso on cpsr.shopOrderID = cso.shopOrderID
|
|
|
+ where cps.id = #{payShopId}
|
|
|
+ and cso.shopId != 998
|
|
|
</select>
|
|
|
</mapper>
|
