提交代码

hai-service/src/main/java/com/hai/dao/HighCouponAgentRelMapperExt.java

@@ -22,7 +22,7 @@ public interface HighCouponAgentRelMapperExt {
             " case when sum(c.sales_price) is not null then sum(c.sales_price) else 0 end salesCountPrice " +
             " from high_coupon_agent_code a,high_coupon_code b,high_coupon_agent_rel c" +
             " where c.id = a.coupon_agent_id and c.agent_id = #{agentId}" +
-            " and a.status = 3 and a.coupon_code_id = b.id  and b.consume_time >= #{consumeTimeS} and b.consume_time <= #{consumeTimeE}")
+            " and b.status = 3 and a.coupon_code_id = b.id  and b.consume_time >= #{consumeTimeS} and b.consume_time <= #{consumeTimeE}")
     AgentSalesModel getAgentSales(@Param("agentId") Long agentId, @Param("consumeTimeS")String consumeTimeS, @Param("consumeTimeE")String consumeTimeE);
 
     @Select(" select a.* from high_coupon_agent_code a,high_coupon_code b,high_coupon_agent_rel c " +

hai-service/src/main/java/com/hai/service/impl/HighCouponAgentServiceImpl.java

@@ -315,6 +315,7 @@ public class HighCouponAgentServiceImpl implements HighCouponAgentService {
     public Map<String, Object> getConvertCodeCountByAgent(Long agentId) {
         Map<String,Object> listMap = new HashMap<>();
         listMap.put("agentId", agentId);
+        listMap.put("type", 2);
         List<HighCouponAgentRel> list = getCouponAgentList(listMap).stream().sorted(Comparator.comparing(HighCouponAgentRel::getSalesPrice)).collect(Collectors.toList());
 
         for (HighCouponAgentRel couponAgentRel : list) {