diff --git a/src/main/java/com/sincere/wechatbusiness/mapper/ChannelMapper.java b/src/main/java/com/sincere/wechatbusiness/mapper/ChannelMapper.java index a48dac1..d31bf4c 100644 --- a/src/main/java/com/sincere/wechatbusiness/mapper/ChannelMapper.java +++ b/src/main/java/com/sincere/wechatbusiness/mapper/ChannelMapper.java @@ -47,7 +47,7 @@ public interface ChannelMapper { List<Users> getRegisterDetailList(@Param("channelId") int channelId,@Param("agentId") int agentId,@Param("type") int type); - List<DiscountPackage> getOrderDetailList(@Param("channelId") int channelId,@Param("agentId") int agentId,@Param("type") int type,@Param("productId") int productId); + List<DiscountPackage> getOrderDetailList(@Param("channelId") int channelId,@Param("agentId") int agentId,@Param("type") int type,@Param("productId") int productId,@Param("state") int state); int insertAccessToken(AccessToken accessToken); diff --git a/src/main/java/com/sincere/wechatbusiness/service/impl/ChannelServiceImpl.java b/src/main/java/com/sincere/wechatbusiness/service/impl/ChannelServiceImpl.java index 5f57998..d584a7e 100644 --- a/src/main/java/com/sincere/wechatbusiness/service/impl/ChannelServiceImpl.java +++ b/src/main/java/com/sincere/wechatbusiness/service/impl/ChannelServiceImpl.java @@ -89,7 +89,7 @@ public class ChannelServiceImpl implements ChannelService { public List<Users> getRegisterDetailList(int channelId,int agentId,int type){return channelMapper.getRegisterDetailList(channelId,agentId,type);} @Override - public List<DiscountPackage> getOrderDetailList(int channelId,int agentId,int type,int productId){return channelMapper.getOrderDetailList(channelId,agentId,type,productId);} + public List<DiscountPackage> getOrderDetailList(int channelId,int agentId,int type,int productId){return channelMapper.getOrderDetailList(channelId,agentId,type,productId,1);} @Override public int insertAccessToken(AccessToken accessToken){return channelMapper.insertAccessToken(accessToken);} diff --git a/src/main/resources/mapper/ChannelMapper.xml b/src/main/resources/mapper/ChannelMapper.xml index a45db17..038c19d 100644 --- a/src/main/resources/mapper/ChannelMapper.xml +++ b/src/main/resources/mapper/ChannelMapper.xml @@ -306,11 +306,15 @@ and DateDiff(mm,create_time,getdate())=0 </if> </where> + order by create_time desc </select> <select id="getOrderDetailList" resultMap="PackageMap"> select account,product_name as package_name,intime from report_voluntary.dbo.orderpay <where> + <if test="state==1"> + and paystate=1 + </if> <if test="channelId>0"> and channelId=#{channelId} </if> @@ -330,6 +334,7 @@ and DateDiff(mm,intime,getdate())=0 </if> </where> + order by intime desc </select> <insert id="insertAccessToken" parameterType="com.sincere.wechatbusiness.model.AccessToken"> -- libgit2 0.21.0