diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingReceiver.java b/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingReceiver.java index b9ea9322f..098dd02f9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingReceiver.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxProfitSharingReceiver.java @@ -81,6 +81,7 @@ public class WxProfitSharingReceiver implements Serializable { private String parameter; /*分账金额**/ + @Transient private Integer sharingAmount; diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index ba85e2235..215bb4437 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -393,7 +393,8 @@ from wx_coupon_merchant cm, (select tco.id as tcoid, (select count(*) from wx_coupon_merchant tcm - where tcm.product_id = tco.coupon_id) as mc + where tcm.product_id = tco.coupon_id + and tcm.status = 0) as mc from wx_coupon_order tco) com, wx_coupon c, wx_c_user cu, @@ -429,7 +430,8 @@ from wx_coupon_order co,wx_coupon c,wx_c_user cu,wx_coupon_merchant cm, (select tco.id as tcoid, (select count(*) from wx_coupon_merchant tcm - where tcm.product_id = tco.coupon_id) as mc + where tcm.product_id = tco.coupon_id + and tcm.status = 0) as mc from wx_coupon_order tco) com where com.mc = 1 and com.tcoid = co.id @@ -474,11 +476,13 @@ from wx_coupon_order co,wx_coupon_merchant cm, (select tco.id as tcoid, (select count(*) from wx_coupon_merchant tcm - where tcm.product_id = tco.coupon_id) + where tcm.product_id = tco.coupon_id and + and tcm.status = 0) as mc from wx_coupon_order tco) com where com.mc = 1 and com.tcoid = co.id + and cm.status = 0 and cm.merchant_id = #{merchantId} and cm.product_id = co.coupon_id