|
|
@@ -150,7 +150,7 @@
|
|
|
</update>
|
|
|
<update id="updateShopOrderPayStatus">
|
|
|
UPDATE cm_shop_order
|
|
|
- SET payStatus = #{payStatus},
|
|
|
+ SET payStatus = #{payStatus},
|
|
|
receiptStatus = #{receiptStatus}
|
|
|
WHERE shopOrderID = #{shopOrderId}
|
|
|
</update>
|
|
|
@@ -161,7 +161,9 @@
|
|
|
WHERE s.shopID = #{shopId}
|
|
|
</update>
|
|
|
<update id="updateReceiptStatus">
|
|
|
- update cm_shop_order set receiptStatus = 3 where shopOrderID = #{shopOrderId}
|
|
|
+ update cm_shop_order
|
|
|
+ set receiptStatus = 3
|
|
|
+ where shopOrderID = #{shopOrderId}
|
|
|
</update>
|
|
|
<select id="getReceiptUserByOpenid" resultType="com.caimei365.order.model.vo.ReceiptUserVo">
|
|
|
SELECT DISTINCT id, user_type AS userType, name, mobile, openid, unionId, password
|
|
|
@@ -236,8 +238,10 @@
|
|
|
</where>
|
|
|
</select>
|
|
|
<select id="getDiscernConfirmType" resultType="java.lang.Integer">
|
|
|
- select cdr.confirmType from cm_receipt_order_relation cror
|
|
|
- LEFT JOIN cm_discern_receipt cdr ON cror.receiptID = cdr.id where cror.shopOrderId = #{shopOrderId}
|
|
|
+ select cdr.confirmType
|
|
|
+ from cm_receipt_order_relation cror
|
|
|
+ LEFT JOIN cm_discern_receipt cdr ON cror.receiptID = cdr.id
|
|
|
+ where cror.shopOrderId = #{shopOrderId}
|
|
|
</select>
|
|
|
<select id="getUncheckAmount" resultType="java.lang.Double">
|
|
|
SELECT IFNULL(SUM(cror.associateAmount), 0)
|
|
|
@@ -304,12 +308,10 @@
|
|
|
cdr.orderFlag,
|
|
|
cdr.noOrderReason,
|
|
|
cdr.reviewReason,
|
|
|
- IFNULL((
|
|
|
- SELECT SUM(b.associateAmount)
|
|
|
- FROM cm_receipt_order_relation b
|
|
|
- WHERE b.receiptID = cdr.id
|
|
|
- AND b.delFlag = '0'
|
|
|
- ), 0) AS associateAmount
|
|
|
+ IFNULL((SELECT SUM(b.associateAmount)
|
|
|
+ FROM cm_receipt_order_relation b
|
|
|
+ WHERE b.receiptID = cdr.id
|
|
|
+ AND b.delFlag = '0'), 0) AS associateAmount
|
|
|
FROM cm_discern_receipt cdr
|
|
|
LEFT JOIN cm_receipt_order_relation cror ON (cror.receiptID = cdr.id AND cror.delFlag = '0')
|
|
|
WHERE cdr.smsMd5Code = #{smsMd5Code}
|
|
|
@@ -410,26 +412,24 @@
|
|
|
cdr.cancelReason,
|
|
|
cdr.confirmType,
|
|
|
cdr.reviewReason,
|
|
|
- IFNULL(cdr.newReceiptType, 2) AS newReceiptType,
|
|
|
+ IFNULL(cdr.newReceiptType, 2) AS newReceiptType,
|
|
|
cdr.shopName,
|
|
|
- receiptUserPermissionID AS receiptUserPermissionId,
|
|
|
- confirmUserPermissionID AS confirmUserPermissionId,
|
|
|
- reviewUserPermissionID AS reviewUserPermissionId,
|
|
|
- cancelUserPermissionID AS cancelUserPermissionId,
|
|
|
+ receiptUserPermissionID AS receiptUserPermissionId,
|
|
|
+ confirmUserPermissionID AS confirmUserPermissionId,
|
|
|
+ reviewUserPermissionID AS reviewUserPermissionId,
|
|
|
+ cancelUserPermissionID AS cancelUserPermissionId,
|
|
|
CASE
|
|
|
WHEN cror.relationType = 2 THEN co.organizeID
|
|
|
WHEN cror.relationType = 1 THEN cso.organizeID
|
|
|
- ELSE '' END AS organizeId,
|
|
|
+ ELSE '' END AS organizeId,
|
|
|
CASE
|
|
|
WHEN cror.relationType = 2 THEN co.userID
|
|
|
WHEN cror.relationType = 1 THEN cso.userID
|
|
|
- ELSE '' END AS userId,
|
|
|
- IFNULL((
|
|
|
- SELECT SUM(b.associateAmount)
|
|
|
- FROM cm_receipt_order_relation b
|
|
|
- WHERE b.receiptID = cdr.id
|
|
|
- AND b.delFlag = '0'
|
|
|
- ), 0) AS associateAmount
|
|
|
+ ELSE '' END AS userId,
|
|
|
+ IFNULL((SELECT SUM(b.associateAmount)
|
|
|
+ FROM cm_receipt_order_relation b
|
|
|
+ WHERE b.receiptID = cdr.id
|
|
|
+ AND b.delFlag = '0'), 0) AS associateAmount
|
|
|
FROM cm_discern_receipt cdr
|
|
|
LEFT JOIN cm_receipt_order_relation cror ON (cror.receiptID = cdr.id AND cror.delFlag = '0')
|
|
|
LEFT JOIN cm_order co ON (cror.orderID = co.orderID AND cror.relationType = 2)
|
|
|
@@ -438,19 +438,19 @@
|
|
|
AND cdr.id = #{id}
|
|
|
</select>
|
|
|
<select id="getReceiptShopOrders" resultType="com.caimei365.order.model.vo.ShopOrderVo">
|
|
|
- SELECT cso.shopOrderID AS shopOrderId,
|
|
|
+ SELECT cso.shopOrderID AS shopOrderId,
|
|
|
cso.shopOrderNo,
|
|
|
- cso.orderID AS orderId,
|
|
|
+ cso.orderID AS orderId,
|
|
|
cso.orderType,
|
|
|
- IFNULL(cso.organizeID, 0) AS organizeId,
|
|
|
- IFNULL(cso.isColdChina, 0) AS isColdChina,
|
|
|
+ IFNULL(cso.organizeID, 0) AS organizeId,
|
|
|
+ IFNULL(cso.isColdChina, 0) AS isColdChina,
|
|
|
cso.orderNo,
|
|
|
- cso.shopID AS shopId,
|
|
|
+ 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.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,
|
|
|
@@ -461,28 +461,28 @@
|
|
|
cso.productAmount,
|
|
|
cso.needPayAmount,
|
|
|
cso.shopProductAmount,
|
|
|
- IFNULL(cso.shopPostFee, 0) AS shopPostFee,
|
|
|
- IFNULL(cso.shopPostFlag, 0) AS shopPostFlag,
|
|
|
+ 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,
|
|
|
+ (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.accountAmount,0) AS accountAmount,
|
|
|
- IFNULL(cso.receiptAmount,0) AS receiptAmount,
|
|
|
+ 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.accountAmount, 0) AS accountAmount,
|
|
|
+ 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
|
|
|
+ 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_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
|
|
|
@@ -494,19 +494,19 @@
|
|
|
ORDER BY cso.orderTime DESC
|
|
|
</select>
|
|
|
<select id="getReceiptOrders" resultType="com.caimei365.order.model.vo.ShopOrderVo">
|
|
|
- SELECT cso.shopOrderID AS shopOrderId,
|
|
|
+ SELECT cso.shopOrderID AS shopOrderId,
|
|
|
cso.shopOrderNo,
|
|
|
- cso.orderID AS orderId,
|
|
|
+ cso.orderID AS orderId,
|
|
|
cso.orderType,
|
|
|
- IFNULL(cso.organizeID, 0) AS organizeId,
|
|
|
- IFNULL(cso.isColdChina, 0) AS isColdChina,
|
|
|
+ IFNULL(cso.organizeID, 0) AS organizeId,
|
|
|
+ IFNULL(cso.isColdChina, 0) AS isColdChina,
|
|
|
cso.orderNo,
|
|
|
- cso.shopID AS shopId,
|
|
|
+ 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.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,
|
|
|
@@ -517,28 +517,28 @@
|
|
|
cso.productAmount,
|
|
|
cso.needPayAmount,
|
|
|
cso.shopProductAmount,
|
|
|
- IFNULL(cso.shopPostFee, 0) AS shopPostFee,
|
|
|
- IFNULL(cso.shopPostFlag, 0) AS shopPostFlag,
|
|
|
+ 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,
|
|
|
+ (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.accountAmount,0) AS accountAmount,
|
|
|
- IFNULL(cso.receiptAmount,0) AS receiptAmount,
|
|
|
+ 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.accountAmount, 0) AS accountAmount,
|
|
|
+ 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
|
|
|
+ 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_shop_order cso
|
|
|
INNER JOIN cm_receipt_order_relation cror ON cso.orderId = cror.orderId
|
|
|
INNER JOIN cm_discern_receipt cdr ON cror.receiptID = cdr.id
|
|
|
@@ -551,19 +551,19 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="getReceiptOrderlist" resultType="com.caimei365.order.model.vo.ShopOrderVo">
|
|
|
- SELECT cso.shopOrderID AS shopOrderId,
|
|
|
+ SELECT cso.shopOrderID AS shopOrderId,
|
|
|
cso.shopOrderNo,
|
|
|
- cso.orderID AS orderId,
|
|
|
+ cso.orderID AS orderId,
|
|
|
cso.orderType,
|
|
|
- IFNULL(cso.organizeID, 0) AS organizeId,
|
|
|
- IFNULL(cso.isColdChina, 0) AS isColdChina,
|
|
|
+ IFNULL(cso.organizeID, 0) AS organizeId,
|
|
|
+ IFNULL(cso.isColdChina, 0) AS isColdChina,
|
|
|
cso.orderNo,
|
|
|
- cso.shopID AS shopId,
|
|
|
+ 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.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,
|
|
|
@@ -574,28 +574,28 @@
|
|
|
cso.productAmount,
|
|
|
cso.needPayAmount,
|
|
|
cso.shopProductAmount,
|
|
|
- IFNULL(cso.shopPostFee, 0) AS shopPostFee,
|
|
|
- IFNULL(cso.shopPostFlag, 0) AS shopPostFlag,
|
|
|
+ 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,
|
|
|
+ (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.accountAmount,0) AS accountAmount,
|
|
|
- IFNULL(cso.receiptAmount,0) AS receiptAmount,
|
|
|
+ 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.accountAmount, 0) AS accountAmount,
|
|
|
+ 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,
|
|
|
+ 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
|
|
|
|
|
|
@@ -684,7 +684,8 @@
|
|
|
LEFT JOIN cm_order_product cop ON cso.shopOrderId = cop.shopOrderId
|
|
|
LEFT JOIN cm_order co ON co.orderID = cso.orderId
|
|
|
<where>
|
|
|
- cso.orderType != 2 and cso.delFlag = '0' and ( s.AccountOwnership = 0 or s.bankAccount is null) AND co.receiptStatus != 3
|
|
|
+ cso.orderType != 2 and cso.delFlag = '0' and ( s.AccountOwnership = 0 or s.bankAccount is null) AND
|
|
|
+ co.receiptStatus != 3
|
|
|
<if test="organizeId == 0">
|
|
|
AND cso.organizeID = 0
|
|
|
</if>
|
|
|
@@ -695,13 +696,13 @@
|
|
|
AND cso.shopOrderId = #{shopOrderId}
|
|
|
</if>
|
|
|
AND (cso.receiptStatus IN
|
|
|
- <foreach collection="receiptStatusArr" open="(" close=")" item="receiptStatus" separator=",">
|
|
|
- #{receiptStatus}
|
|
|
- </foreach>
|
|
|
- AND cso.shopStatus IN
|
|
|
- <foreach collection="orderStatusList" open="(" close=")" item="status" separator=",">
|
|
|
- #{status}
|
|
|
- </foreach>
|
|
|
+ <foreach collection="receiptStatusArr" open="(" close=")" item="receiptStatus" separator=",">
|
|
|
+ #{receiptStatus}
|
|
|
+ </foreach>
|
|
|
+ AND cso.shopStatus IN
|
|
|
+ <foreach collection="orderStatusList" open="(" close=")" item="status" separator=",">
|
|
|
+ #{status}
|
|
|
+ </foreach>
|
|
|
)
|
|
|
<if test="userIds != null and userIds.size() > 0">
|
|
|
AND cso.userID IN
|
|
|
@@ -721,7 +722,7 @@
|
|
|
AND cop.productID IN(6060, 6061, 6062, 6063, 6064,6065, 6066, 6067, 6068, 6069)
|
|
|
</if>
|
|
|
</where>
|
|
|
- ORDER BY cso.orderTime desc
|
|
|
+ ORDER BY cso.orderTime desc
|
|
|
</select>
|
|
|
<select id="getOrderListByOrderIds" resultType="com.caimei365.order.model.vo.ShopOrderVo">
|
|
|
SELECT DISTINCT
|
|
|
@@ -812,15 +813,15 @@
|
|
|
AND STATUS = '2'
|
|
|
</select>
|
|
|
<select id="getShopOrderListByReceiptId" resultType="com.caimei365.order.model.vo.ShopOrderVo">
|
|
|
- SELECT DISTINCT cso.shopOrderId AS shopOrderId,
|
|
|
+ SELECT DISTINCT cso.shopOrderId AS shopOrderId,
|
|
|
cso.shopOrderNo,
|
|
|
- cso.orderID AS orderId,
|
|
|
+ cso.orderID AS orderId,
|
|
|
cso.orderNo,
|
|
|
- cso.shopID AS shopId,
|
|
|
+ cso.shopID AS shopId,
|
|
|
cso.note,
|
|
|
- cso.userID AS userId,
|
|
|
- cso.clubID AS clubId,
|
|
|
- cso.spID AS spId,
|
|
|
+ cso.userID AS userId,
|
|
|
+ cso.clubID AS clubId,
|
|
|
+ cso.spID AS spId,
|
|
|
cso.orderPromotionsId,
|
|
|
cso.promotionFullReduction,
|
|
|
cso.brokerage,
|
|
|
@@ -839,21 +840,23 @@
|
|
|
cso.payStatus,
|
|
|
cso.splitFlag,
|
|
|
cso.shopOtherFee,
|
|
|
- s.name AS shopName,
|
|
|
- ifnull(co.secondHandOrderFlag, 0) as secondHandOrderFlag,
|
|
|
- ifnull(cso.sendOutStatus, 1) as sendOutStatus,
|
|
|
- ifnull(cso.receiptStatus, 1) as receiptStatus,
|
|
|
+ s.name AS shopName,
|
|
|
+ ifnull(co.secondHandOrderFlag, 0) as secondHandOrderFlag,
|
|
|
+ ifnull(cso.sendOutStatus, 1) as sendOutStatus,
|
|
|
+ ifnull(cso.receiptStatus, 1) as receiptStatus,
|
|
|
cso.orderType,
|
|
|
cso.organizeId,
|
|
|
- cso.shopStatus as status,
|
|
|
- ifnull(cso.orderStatusFlag,1) as orderStatusFlag,
|
|
|
- IFNULL(cso.refundStatus, 1) AS refundStatus,
|
|
|
- (select sum(associateAmount) from cm_receipt_order_relation where shopOrderID = cso.shopOrderID) as receiptAmount,
|
|
|
+ cso.shopStatus as status,
|
|
|
+ ifnull(cso.orderStatusFlag, 1) as orderStatusFlag,
|
|
|
+ IFNULL(cso.refundStatus, 1) AS refundStatus,
|
|
|
+ (select sum(associateAmount)
|
|
|
+ from cm_receipt_order_relation
|
|
|
+ where shopOrderID = cso.shopOrderID) as receiptAmount,
|
|
|
(select userName from user where userID = cso.userId LIMIT 1) as userName,
|
|
|
IFNULL((SELECT SUM(refundAmount)
|
|
|
FROM cm_refund_shop_record
|
|
|
WHERE shopOrderID = cso.shopOrderID
|
|
|
- AND delFlag = 0), 0) AS shopRefundAmount
|
|
|
+ AND delFlag = 0), 0) AS shopRefundAmount
|
|
|
FROM cm_receipt_order_relation cror
|
|
|
LEFT JOIN cm_shop_order cso ON cso.shopOrderID = cror.orderID
|
|
|
LEFT JOIN shop s ON s.shopID = cso.shopID
|
|
|
@@ -899,7 +902,8 @@
|
|
|
cso.shopStatus as status,
|
|
|
ifnull(cso.orderStatusFlag,1) as orderStatusFlag,
|
|
|
IFNULL(cso.refundStatus, 1) AS refundStatus,
|
|
|
- (select sum(associateAmount) from cm_receipt_order_relation where shopOrderID = cso.shopOrderID) as receiptAmount,
|
|
|
+ (select sum(associateAmount) from cm_receipt_order_relation where shopOrderID = cso.shopOrderID) as
|
|
|
+ receiptAmount,
|
|
|
(select userName from user where userID = cso.userId LIMIT 1) as userName,
|
|
|
IFNULL((SELECT SUM(refundAmount) FROM cm_refund_shop_record WHERE shopOrderID = cso.shopOrderID AND delFlag =
|
|
|
0), 0) AS shopRefundAmount
|
|
|
@@ -967,7 +971,8 @@
|
|
|
cso.organizeId,
|
|
|
cso.shopStatus as status,
|
|
|
ifnull(cso.orderStatusFlag,1) as orderStatusFlag,
|
|
|
- (select sum(associateAmount) from cm_receipt_order_relation where shopOrderID = cso.shopOrderID) as receiptAmount,
|
|
|
+ (select sum(associateAmount) from cm_receipt_order_relation where shopOrderID = cso.shopOrderID) as
|
|
|
+ receiptAmount,
|
|
|
(select userName from user where userID = cso.userId LIMIT 1) as userName,
|
|
|
IF((SELECT (crpp.id) FROM cm_returned_purchase_product crpp LEFT JOIN cm_returned_purchase crp ON crp.id =
|
|
|
crpp.returnedID
|
|
|
@@ -999,15 +1004,15 @@
|
|
|
ORDER BY cso.shopOrderID DESC
|
|
|
</select>
|
|
|
<select id="getShopOrderById" resultType="com.caimei365.order.model.vo.ShopOrderVo">
|
|
|
- SELECT shopOrderID AS shopOrderId,
|
|
|
+ SELECT shopOrderID AS shopOrderId,
|
|
|
shopOrderNo,
|
|
|
- orderID AS orderId,
|
|
|
+ orderID AS orderId,
|
|
|
orderNo,
|
|
|
- shopID AS shopId,
|
|
|
+ shopID AS shopId,
|
|
|
note,
|
|
|
- userID AS userId,
|
|
|
- clubID AS clubId,
|
|
|
- spID AS spId,
|
|
|
+ userID AS userId,
|
|
|
+ clubID AS clubId,
|
|
|
+ spID AS spId,
|
|
|
orderPromotionsId,
|
|
|
promotionFullReduction,
|
|
|
brokerage,
|
|
|
@@ -1022,7 +1027,7 @@
|
|
|
shouldPayShopAmount,
|
|
|
payedShopAmount,
|
|
|
outStoreNum,
|
|
|
- IFNULL(presentNum, 0) AS presentNum,
|
|
|
+ IFNULL(presentNum, 0) AS presentNum,
|
|
|
orderTime,
|
|
|
orderSubmitType,
|
|
|
payStatus,
|
|
|
@@ -1236,21 +1241,21 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="findCmCost" resultType="java.lang.Double">
|
|
|
- select ifnull(sum(cmCostPrice * num),0)
|
|
|
+ select ifnull(sum(cmCostPrice * num), 0)
|
|
|
from cm_order_product
|
|
|
where shopOrderID = #{shopOrderId}
|
|
|
</select>
|
|
|
|
|
|
<select id="getPlatformOrderByReceiptId" resultType="com.caimei365.order.model.vo.ShopOrderVo">
|
|
|
- SELECT DISTINCT cso.shopOrderId AS shopOrderId,
|
|
|
+ SELECT DISTINCT cso.shopOrderId AS shopOrderId,
|
|
|
cso.shopOrderNo,
|
|
|
- cso.orderID AS orderId,
|
|
|
+ cso.orderID AS orderId,
|
|
|
cso.orderNo,
|
|
|
- cso.shopID AS shopId,
|
|
|
+ cso.shopID AS shopId,
|
|
|
cso.note,
|
|
|
- cso.userID AS userId,
|
|
|
- cso.clubID AS clubId,
|
|
|
- cso.spID AS spId,
|
|
|
+ cso.userID AS userId,
|
|
|
+ cso.clubID AS clubId,
|
|
|
+ cso.spID AS spId,
|
|
|
cso.orderPromotionsId,
|
|
|
cso.promotionFullReduction,
|
|
|
cso.brokerage,
|
|
|
@@ -1267,34 +1272,39 @@
|
|
|
cso.orderTime,
|
|
|
cso.orderSubmitType,
|
|
|
cso.payStatus,
|
|
|
- ifnull(cso.sendOutStatus, 1) as sendOutStatus,
|
|
|
- ifnull(cso.receiptStatus, 1) as receiptStatus,
|
|
|
+ ifnull(cso.sendOutStatus, 1) as sendOutStatus,
|
|
|
+ ifnull(cso.receiptStatus, 1) as receiptStatus,
|
|
|
cso.splitFlag,
|
|
|
cso.shopOtherFee,
|
|
|
cso.orderType,
|
|
|
cso.organizeId,
|
|
|
- cso.shopStatus as status,
|
|
|
- ifnull(cso.orderStatusFlag,1) as orderStatusFlag,
|
|
|
- IFNULL(cso.refundStatus, 1) AS refundStatus,
|
|
|
- s.name AS shopName,
|
|
|
- (SELECT SUM(cmCostPrice*(num+presentnum) )FROM cm_order_product WHERE shopOrderId = cso.shopOrderId) AS cmCostPrice,
|
|
|
+ cso.shopStatus as status,
|
|
|
+ ifnull(cso.orderStatusFlag, 1) as orderStatusFlag,
|
|
|
+ IFNULL(cso.refundStatus, 1) AS refundStatus,
|
|
|
+ s.name AS shopName,
|
|
|
+ (SELECT SUM(cmCostPrice * (num + presentnum))
|
|
|
+ FROM cm_order_product
|
|
|
+ WHERE shopOrderId = cso.shopOrderId) AS cmCostPrice,
|
|
|
(select userName from user where userID = cso.userId LIMIT 1) as userName,
|
|
|
- (select sum(associateAmount) from cm_receipt_order_relation where shopOrderID = cso.shopOrderID and relationType !=7) as receiptAmount,
|
|
|
+ (select sum(associateAmount)
|
|
|
+ from cm_receipt_order_relation
|
|
|
+ where shopOrderID = cso.shopOrderID and relationType != 7) as receiptAmount,
|
|
|
IFNULL((SELECT SUM(refundAmount)
|
|
|
FROM cm_refund_shop_record
|
|
|
WHERE shopOrderID = cso.shopOrderID
|
|
|
- AND delFlag = 0), 0) AS shopRefundAmount
|
|
|
+ AND delFlag = 0), 0) AS shopRefundAmount
|
|
|
FROM cm_receipt_order_relation cror
|
|
|
- LEFT JOIN cm_shop_order cso ON cso.shopOrderID = cror.shopOrderID
|
|
|
- left join cm_discern_receipt cdr on cror.receiptID = cdr.id
|
|
|
- LEFT JOIN shop s ON s.shopID = cso.shopID
|
|
|
+ LEFT JOIN cm_shop_order cso ON cso.shopOrderID = cror.shopOrderID
|
|
|
+ left join cm_discern_receipt cdr on cror.receiptID = cdr.id
|
|
|
+ LEFT JOIN shop s ON s.shopID = cso.shopID
|
|
|
WHERE cror.delFlag = '0'
|
|
|
and cso.organizeID = 0
|
|
|
AND cror.receiptID = #{receiptId}
|
|
|
</select>
|
|
|
|
|
|
<select id="getPlatformOrderByName" resultType="com.caimei365.order.model.vo.ShopOrderVo">
|
|
|
- SELECT DISTINCT
|
|
|
+ -- 所有线下/余额已收款，并没有关联过服务费的子订单
|
|
|
+ (SELECT DISTINCT
|
|
|
cso.shopOrderId AS shopOrderId,
|
|
|
cso.shopOrderNo,
|
|
|
cso.orderID AS orderId,
|
|
|
@@ -1322,17 +1332,19 @@
|
|
|
cso.payStatus,
|
|
|
cso.orderType,
|
|
|
cso.organizeId,
|
|
|
- cso.shopStatus as status,
|
|
|
- ifnull(cso.orderStatusFlag,1) as orderStatusFlag,
|
|
|
+ cso.shopStatus AS STATUS,
|
|
|
+ IFNULL(cso.orderStatusFlag,1) AS orderStatusFlag,
|
|
|
IFNULL(cso.refundStatus, 1) AS refundStatus,
|
|
|
- (select userName from user where userID = cso.userId LIMIT 1) as userName,
|
|
|
- (select sum(associateAmount) from cm_receipt_order_relation where shopOrderID = cso.shopOrderID and relationType !=7) as receiptAmount,
|
|
|
- ifnull(cso.sendOutStatus, 1) as sendOutStatus,
|
|
|
- ifnull(cso.receiptStatus, 1) as receiptStatus,
|
|
|
+ (SELECT userName FROM USER WHERE userID = cso.userId LIMIT 1) AS userName,
|
|
|
+ (SELECT SUM(associateAmount) FROM cm_receipt_order_relation WHERE shopOrderID = cso.shopOrderID AND relationType
|
|
|
+ !=7) AS receiptAmount,
|
|
|
+ IFNULL(cso.sendOutStatus, 1) AS sendOutStatus,
|
|
|
+ IFNULL(cso.receiptStatus, 1) AS receiptStatus,
|
|
|
cso.splitFlag,
|
|
|
cso.shopOtherFee,
|
|
|
s.name AS shopName,
|
|
|
- (SELECT SUM(cmCostPrice*(num+presentnum) )FROM cm_order_product WHERE shopOrderId = cso.shopOrderId) AS cmCostPrice,
|
|
|
+ (SELECT SUM(cmCostPrice*(num+presentnum) )FROM cm_order_product WHERE shopOrderId = cso.shopOrderId) AS
|
|
|
+ cmCostPrice,
|
|
|
IF((SELECT (crpp.id) FROM cm_returned_purchase_product crpp LEFT JOIN cm_returned_purchase crp ON crp.id =
|
|
|
crpp.returnedID
|
|
|
WHERE crpp.shopOrderID = cso.shopOrderID AND crp.status = '1' AND crp.delFlag = 0 LIMIT 1) > 0, 1, 0) AS
|
|
|
@@ -1340,18 +1352,78 @@
|
|
|
FROM cm_shop_order cso
|
|
|
LEFT JOIN shop s ON s.shopID = cso.shopID
|
|
|
LEFT JOIN cm_receipt_order_relation cror ON cso.shopOrderId = cror.shopOrderId
|
|
|
- LEFT JOIN cm_discern_receipt cdr ON cdr.id = cror.receiptId
|
|
|
+ LEFT JOIN cm_discern_receipt cdr ON cdr.id = cror.receiptId AND cdr.id >0
|
|
|
<where>
|
|
|
+ cso.delFlag = '0'
|
|
|
<if test="shopName != null and shopName != ''">
|
|
|
AND (s.name LIKE CONCAT('%', #{shopName}, '%') or cso.shopOrderId = #{shopName})
|
|
|
</if>
|
|
|
- AND cso.delFlag = '0'
|
|
|
+ AND cso.organizeID = 0
|
|
|
+ AND cso.shopStatus IN(1,2,3)
|
|
|
AND cso.orderTime > '2023-01-01'
|
|
|
- AND CSO.shopStatus NOT IN (0, 3, 4)
|
|
|
- and cso.organizeID = 0
|
|
|
- AND (cdr.payWay != 1 OR cdr.payWay IS NULL)
|
|
|
- AND (cdr.receiptStatus IS NULL OR cdr.receiptStatus = 1)
|
|
|
+ AND cdr.payWay != 1
|
|
|
+ AND cdr.receiptType NOT IN(10,11)
|
|
|
</where>
|
|
|
- ORDER BY cso.shopOrderID DESC
|
|
|
+ ORDER BY cso.shopOrderID DESC)
|
|
|
+ UNION
|
|
|
+ (-- 所有未付款子订单
|
|
|
+ SELECT DISTINCT
|
|
|
+ cso.shopOrderId AS shopOrderId,
|
|
|
+ cso.shopOrderNo,
|
|
|
+ cso.orderID AS orderId,
|
|
|
+ cso.orderNo,
|
|
|
+ cso.shopID AS shopId,
|
|
|
+ cso.note,
|
|
|
+ cso.userID AS userId,
|
|
|
+ cso.clubID AS clubId,
|
|
|
+ cso.spID AS spId,
|
|
|
+ cso.orderPromotionsId,
|
|
|
+ cso.promotionFullReduction,
|
|
|
+ cso.brokerage,
|
|
|
+ cso.canRefundAmount,
|
|
|
+ cso.itemCount,
|
|
|
+ cso.totalAmount,
|
|
|
+ cso.productAmount,
|
|
|
+ cso.needPayAmount,
|
|
|
+ cso.shopProductAmount,
|
|
|
+ cso.shopPostFee,
|
|
|
+ cso.shopTaxFee,
|
|
|
+ cso.shouldPayShopAmount,
|
|
|
+ cso.payedShopAmount,
|
|
|
+ cso.orderTime,
|
|
|
+ cso.orderSubmitType,
|
|
|
+ cso.payStatus,
|
|
|
+ cso.orderType,
|
|
|
+ cso.organizeId,
|
|
|
+ cso.shopStatus AS STATUS,
|
|
|
+ IFNULL(cso.orderStatusFlag,1) AS orderStatusFlag,
|
|
|
+ IFNULL(cso.refundStatus, 1) AS refundStatus,
|
|
|
+ (SELECT userName FROM USER WHERE userID = cso.userId LIMIT 1) AS userName,
|
|
|
+ (SELECT SUM(associateAmount) FROM cm_receipt_order_relation WHERE shopOrderID = cso.shopOrderID AND relationType
|
|
|
+ !=7) AS receiptAmount,
|
|
|
+ IFNULL(cso.sendOutStatus, 1) AS sendOutStatus,
|
|
|
+ IFNULL(cso.receiptStatus, 1) AS receiptStatus,
|
|
|
+ cso.splitFlag,
|
|
|
+ cso.shopOtherFee,
|
|
|
+ s.name AS shopName,
|
|
|
+ (SELECT SUM(cmCostPrice*(num+presentnum) )FROM cm_order_product WHERE shopOrderId = cso.shopOrderId) AS
|
|
|
+ cmCostPrice,
|
|
|
+ IF((SELECT (crpp.id) FROM cm_returned_purchase_product crpp LEFT JOIN cm_returned_purchase crp ON crp.id =
|
|
|
+ crpp.returnedID
|
|
|
+ WHERE crpp.shopOrderID = cso.shopOrderID AND crp.status = '1' AND crp.delFlag = 0 LIMIT 1) > 0, 1, 0) AS
|
|
|
+ haveReturning
|
|
|
+ FROM cm_shop_order cso
|
|
|
+ LEFT JOIN shop s ON s.shopID = cso.shopID
|
|
|
+ <where>
|
|
|
+ cso.delFlag = '0'
|
|
|
+ <if test="shopName != null and shopName != ''">
|
|
|
+ AND (s.name LIKE CONCAT('%', #{shopName}, '%') or cso.shopOrderId = #{shopName})
|
|
|
+ </if>
|
|
|
+ AND cso.organizeID = 0
|
|
|
+ AND cso.shopStatus IN(1,2,3)
|
|
|
+ AND cso.orderTime > '2023-01-01'
|
|
|
+ AND cso.receiptStatus = 1
|
|
|
+ </where>
|
|
|
+ ORDER BY cso.shopOrderID DESC)
|
|
|
</select>
|
|
|
</mapper>
|
zhijiezhao