diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopUserService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopUserService.java index bef8dd060..75ddf0f26 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopUserService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopUserService.java @@ -24,7 +24,7 @@ public interface ShopUserService extends IService { @Override default UpdateChain updateChain() { - return new UpdateChain<>(getMapper()); + return new CzgUpdateChain<>(getMapper()); } /** diff --git a/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml b/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml index 298c36d92..2e183be66 100644 --- a/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml +++ b/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml @@ -21,7 +21,12 @@ AND detail.group_order_no = #{param.groupOrderNo} - AND detail.STATUS = #{param.status} + + AND (detail.STATUS = '退款中' or detail.STATUS = '已退款') + + + AND detail.STATUS = #{param.status} + AND detail.user_id = #{param.userId} @@ -55,7 +60,12 @@ AND detail.group_order_no = #{param.groupOrderNo} - AND detail.STATUS = #{param.status} + + AND (detail.STATUS = '退款中' or detail.STATUS = '已退款') + + + AND detail.STATUS = #{param.status} + AND detail.user_id = #{param.userId} @@ -68,7 +78,9 @@ order by - detail.`status` desc,detail.pay_time desc, + + detail.`status` desc,detail.pay_time desc, + detail.create_time desc