|
@@ -283,7 +283,8 @@
|
|
|
IFNULL((
|
|
|
SELECT SUM(b.associateAmount)
|
|
|
FROM cm_receipt_order_relation b
|
|
|
- WHERE b.receiptID = cdr.id AND b.delFlag = '0'
|
|
|
+ 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')
|
|
@@ -339,9 +340,9 @@
|
|
|
<if test="endDate != null and endDate != ''">
|
|
|
AND cdr.receiptDate <![CDATA[ < ]]> #{endDate}
|
|
|
</if>
|
|
|
- <if test="newReceiptType !=null and newReceiptType !=''">
|
|
|
- and cdr.newReceiptType=#{newReceiptType}
|
|
|
- </if>
|
|
|
+ <if test="newReceiptType !=null and newReceiptType !=''">
|
|
|
+ and cdr.newReceiptType=#{newReceiptType}
|
|
|
+ </if>
|
|
|
<if test="receiptStatusArr != null">
|
|
|
AND cdr.receiptStatus in
|
|
|
<foreach collection="receiptStatusArr" open="(" close=")" separator="," item="val">
|
|
@@ -382,30 +383,31 @@
|
|
|
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,
|
|
|
+ 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
|
|
|
+ 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)
|
|
|
LEFT JOIN cm_shop_order cso ON (cror.orderID = cso.shopOrderID AND cror.relationType = 1)
|
|
|
- -- AND cror.relationType = 1
|
|
|
+ -- AND cror.relationType = 1
|
|
|
|
|
|
|
|
|
WHERE cdr.delFlag = '0'
|
|
@@ -529,7 +531,7 @@
|
|
|
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
|
|
|
+ LEFT JOIN shop s ON s.shopID = cms.shopID
|
|
|
WHERE cdr.id = #{receiptId}
|
|
|
AND o.delFlag = '0'
|
|
|
AND cms.delFlag = '0'
|
|
@@ -538,11 +540,10 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="getReceiptOrderlists" resultType="com.caimei365.order.model.vo.OrderVo">
|
|
|
- SELECT
|
|
|
- cdr.newReceiptType,
|
|
|
+ SELECT cdr.newReceiptType,
|
|
|
cdr.shopName
|
|
|
FROM cm_discern_receipt cdr
|
|
|
- LEFT JOIN shop s ON s.shopID=cdr.shopID
|
|
|
+ LEFT JOIN shop s ON s.shopID = cdr.shopID
|
|
|
WHERE cdr.id = #{receiptId}
|
|
|
AND cdr.delFlag = '0'
|
|
|
</select>
|
|
@@ -745,15 +746,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,
|
|
@@ -773,15 +774,16 @@
|
|
|
cso.sendOutStatus,
|
|
|
cso.splitFlag,
|
|
|
cso.shopOtherFee,
|
|
|
- s.name AS shopName,
|
|
|
- ifnull(co.secondHandOrderFlag,0) as secondHandOrderFlag,
|
|
|
+ s.name AS shopName,
|
|
|
+ ifnull(co.secondHandOrderFlag, 0) as secondHandOrderFlag,
|
|
|
IFNULL((SELECT SUM(refundAmount)
|
|
|
- FROM cm_refund_shop_record
|
|
|
- WHERE shopOrderID = cso.shopOrderID AND delFlag = 0), 0) AS shopRefundAmount
|
|
|
+ FROM cm_refund_shop_record
|
|
|
+ WHERE shopOrderID = cso.shopOrderID
|
|
|
+ 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
|
|
|
- LEFT JOIN cm_order co on co.orderID = cso.orderID
|
|
|
+ LEFT JOIN cm_shop_order cso ON cso.shopOrderID = cror.orderID
|
|
|
+ LEFT JOIN shop s ON s.shopID = cso.shopID
|
|
|
+ LEFT JOIN cm_order co on co.orderID = cso.orderID
|
|
|
WHERE cror.delFlag = '0'
|
|
|
AND cror.relationType = '1'
|
|
|
AND cror.receiptID = #{receiptId}
|
|
@@ -1068,35 +1070,35 @@
|
|
|
</select>
|
|
|
<select id="ReceiptDetail" resultType="com.caimei365.order.model.vo.ShopOrderVo">
|
|
|
SELECT DISTINCT
|
|
|
- cms.orderID,
|
|
|
- cms.shopOrderID,
|
|
|
- cms.shopOrderNo,
|
|
|
- s.name AS shopName,
|
|
|
- cms.productAmount,
|
|
|
- cmo.orderNo,
|
|
|
- u.userName,
|
|
|
- cmo.confirmTime,
|
|
|
- cms.receiptAmount,
|
|
|
- cms.needPayAmount,
|
|
|
- cms.payedShopAmount,
|
|
|
- cmo.rebateFee
|
|
|
+ cms.orderID,
|
|
|
+ cms.shopOrderID,
|
|
|
+ cms.shopOrderNo,
|
|
|
+ s.name AS shopName,
|
|
|
+ cms.productAmount,
|
|
|
+ cmo.orderNo,
|
|
|
+ u.userName,
|
|
|
+ cmo.confirmTime,
|
|
|
+ cms.receiptAmount,
|
|
|
+ cms.needPayAmount,
|
|
|
+ cms.payedShopAmount,
|
|
|
+ cmo.rebateFee
|
|
|
FROM cm_shop_order cms
|
|
|
- LEFT JOIN shop s ON s.shopID = cms.shopID
|
|
|
- LEFT JOIN cm_order cmo ON cmo.orderID = cms.orderID
|
|
|
- LEFT JOIN `user` u ON u.userID = cms.userID
|
|
|
- LEFT JOIN cm_discern_receipt csp ON csp.shopOrderID = cms.shopOrderID
|
|
|
- <where>
|
|
|
- <if test="keyWord !=null and keyWord !=''">
|
|
|
- AND (s.name LIKE concat('%',#{keyWord},'%') or cmo.orderId=#{keyWord})
|
|
|
- </if>
|
|
|
- AND cms.payStatus=3
|
|
|
- AND cmo.receiptStatus = 3
|
|
|
- AND cmo.confirmTime >= '2021-09-01 00:01:00'
|
|
|
- AND cmo.rebateFlag != 1
|
|
|
- AND cms.shopId != 998
|
|
|
- AND csp.newReceiptType is null
|
|
|
- ORDER BY orderId DESC
|
|
|
- </where>
|
|
|
+ LEFT JOIN shop s ON s.shopID = cms.shopID
|
|
|
+ LEFT JOIN cm_order cmo ON cmo.orderID = cms.orderID
|
|
|
+ LEFT JOIN `user` u ON u.userID = cms.userID
|
|
|
+ LEFT JOIN cm_discern_receipt csp ON csp.shopOrderID = cms.shopOrderID
|
|
|
+ <where>
|
|
|
+ <if test="keyWord !=null and keyWord !=''">
|
|
|
+ AND (s.name LIKE concat('%',#{keyWord},'%') or cmo.orderId=#{keyWord})
|
|
|
+ </if>
|
|
|
+ AND cms.payStatus=3
|
|
|
+ AND cmo.receiptStatus = 3
|
|
|
+ AND cmo.confirmTime >= '2021-09-01 00:01:00'
|
|
|
+ AND cmo.rebateFlag != 1
|
|
|
+ AND cms.shopId != 998
|
|
|
+ AND csp.newReceiptType is null
|
|
|
+ ORDER BY orderId DESC
|
|
|
+ </where>
|
|
|
</select>
|
|
|
|
|
|
<select id="ReceiptDetails" resultType="com.caimei365.order.model.vo.ShopOrderVo">
|
|
@@ -1112,6 +1114,13 @@
|
|
|
|
|
|
|
|
|
</select>
|
|
|
+ <select id="getTeamClubUserIdBySpId" resultType="java.lang.Integer">
|
|
|
+ SELECT userID
|
|
|
+ FROM club
|
|
|
+ WHERE spID IN (SELECT serviceId
|
|
|
+ FROM cm_serviceteam_group
|
|
|
+ WHERE teamId = (SELECT teamId FROM cm_serviceteam_group WHERE serviceId = #{spId}))
|
|
|
+ </select>
|
|
|
|
|
|
|
|
|
</mapper>
|