ufo / yohoufo-fore · Commits

Go to a project

Authored by LUOXC
Commit 29a847b4fe019307c2fec68058cf488864fb3f9e 2 parents 8def558d ad9f93ca

Merge branch 'hotfix-invite-activity' into test6.9.0

Inline Side-by-side
Showing 5 changed files with 32 additions and 9 deletions
@@ -58,6 +58,7 @@ public interface InviteSettlementItemMapper { @@ -58,6 +58,7 @@ public interface InviteSettlementItemMapper {
58 * @return 58 * @return
59 */ 59 */
60 InviteSettlementItemStats selectStats(@Param("uid") Integer uid, 60 InviteSettlementItemStats selectStats(@Param("uid") Integer uid,
  61 + @Param("statusList") List<Integer> statusList,
61 @Param("type") Integer type, 62 @Param("type") Integer type,
62 @Param("startTime") Integer startTime, 63 @Param("startTime") Integer startTime,
63 @Param("endTime") Integer endTime); 64 @Param("endTime") Integer endTime);
@@ -73,6 +74,7 @@ public interface InviteSettlementItemMapper { @@ -73,6 +74,7 @@ public interface InviteSettlementItemMapper {
73 * @return 74 * @return
74 */ 75 */
75 List<InviteSettlementItem> select(@Param("uid") Integer uid, 76 List<InviteSettlementItem> select(@Param("uid") Integer uid,
  77 + @Param("statusList") List<Integer> statusList,
76 @Param("type") Integer type, 78 @Param("type") Integer type,
77 @Param("startTime") Integer startTime, 79 @Param("startTime") Integer startTime,
78 @Param("endTime") Integer endTime, 80 @Param("endTime") Integer endTime,
@@ -136,7 +136,10 @@ @@ -136,7 +136,10 @@
136 from invite_settlement_item 136 from invite_settlement_item
137 where uid = #{uid,jdbcType=INTEGER} 137 where uid = #{uid,jdbcType=INTEGER}
138 and type = #{type,jdbcType=INTEGER} 138 and type = #{type,jdbcType=INTEGER}
139 - and status in (1,3,4) 139 + and status in
  140 + <foreach collection="statusList" item="status" open="(" separator="," close=")">
  141 + #{status}
  142 + </foreach>
140 and order_create_time between #{startTime,jdbcType=INTEGER} and #{endTime,jdbcType=INTEGER} 143 and order_create_time between #{startTime,jdbcType=INTEGER} and #{endTime,jdbcType=INTEGER}
141 </select> 144 </select>
142 145
@@ -146,7 +149,10 @@ @@ -146,7 +149,10 @@
146 from invite_settlement_item 149 from invite_settlement_item
147 where uid = #{uid,jdbcType=INTEGER} 150 where uid = #{uid,jdbcType=INTEGER}
148 and type = #{type,jdbcType=INTEGER} 151 and type = #{type,jdbcType=INTEGER}
149 - and status in (1,3,4) 152 + and status in
  153 + <foreach collection="statusList" item="status" open="(" separator="," close=")">
  154 + #{status}
  155 + </foreach>
150 and order_create_time between #{startTime,jdbcType=INTEGER} and #{endTime,jdbcType=INTEGER} 156 and order_create_time between #{startTime,jdbcType=INTEGER} and #{endTime,jdbcType=INTEGER}
151 order by order_create_time desc 157 order by order_create_time desc
152 limit #{start,jdbcType=INTEGER},#{limit,jdbcType=INTEGER} 158 limit #{start,jdbcType=INTEGER},#{limit,jdbcType=INTEGER}
@@ -47,11 +47,12 @@ public class InviteSettlementController { @@ -47,11 +47,12 @@ public class InviteSettlementController {
47 */ 47 */
48 @RequestMapping(params = "method=ufo.invite.getInviteSettlementItemList") 48 @RequestMapping(params = "method=ufo.invite.getInviteSettlementItemList")
49 public ApiResponse getInviteSettlementItemList(@RequestParam(value = "uid") Integer uid, 49 public ApiResponse getInviteSettlementItemList(@RequestParam(value = "uid") Integer uid,
  50 + @RequestParam(value = "tab") Integer tab,
50 @RequestParam(value = "month") String month, 51 @RequestParam(value = "month") String month,
51 @RequestParam(value = "page", required = false, defaultValue = "1") Integer page, 52 @RequestParam(value = "page", required = false, defaultValue = "1") Integer page,
52 @RequestParam(value = "limit", required = false, defaultValue = "10") Integer limit) { 53 @RequestParam(value = "limit", required = false, defaultValue = "10") Integer limit) {
53 log.info("get inviter settlement item list, uid is {}", uid); 54 log.info("get inviter settlement item list, uid is {}", uid);
54 - InviteSettlementItemListVO resp = inviteSettlementService.getInviteSettlementItemList(uid, month, page, limit); 55 + InviteSettlementItemListVO resp = inviteSettlementService.getInviteSettlementItemList(uid, tab, month, page, limit);
55 return new ApiResponse.ApiResponseBuilder().code(200).data(resp).message("ok").build(); 56 return new ApiResponse.ApiResponseBuilder().code(200).data(resp).message("ok").build();
56 } 57 }
57 58
@@ -15,7 +15,7 @@ public interface IInviteSettlementService { @@ -15,7 +15,7 @@ public interface IInviteSettlementService {
15 */ 15 */
16 InviteSettlementListVO getInviteSettlementList(Integer uid); 16 InviteSettlementListVO getInviteSettlementList(Integer uid);
17 17
18 - InviteSettlementItemListVO getInviteSettlementItemList(Integer uid, String month, Integer page, Integer limit); 18 + InviteSettlementItemListVO getInviteSettlementItemList(Integer uid, Integer tab, String month, Integer page, Integer limit);
19 19
20 /** 20 /**
21 * 结算 21 * 结算
@@ -88,14 +88,15 @@ public class InviteSettlementServiceImpl implements IInviteSettlementService { @@ -88,14 +88,15 @@ public class InviteSettlementServiceImpl implements IInviteSettlementService {
88 } 88 }
89 89
90 @Override 90 @Override
91 - public InviteSettlementItemListVO getInviteSettlementItemList(Integer uid, String month, Integer page, Integer limit) {  
92 - if (!ObjectUtils.allNotNull(uid, month, page, limit) || uid <= 0 || page <= 0 || limit <= 0) { 91 + public InviteSettlementItemListVO getInviteSettlementItemList(Integer uid, Integer tab, String month, Integer page, Integer limit) {
  92 + if (!ObjectUtils.allNotNull(uid, tab, month, page, limit) || uid <= 0 || page <= 0 || limit <= 0) {
93 throwServiceException("参数不正确"); 93 throwServiceException("参数不正确");
94 } 94 }
95 Pair<Integer, Integer> time = getTimeRangeOfMonth(month); 95 Pair<Integer, Integer> time = getTimeRangeOfMonth(month);
  96 + List<Integer> statusList = getStatusList(tab);
96 // 只查询结算规则1的记录 97 // 只查询结算规则1的记录
97 int settlementType = 1; 98 int settlementType = 1;
98 - InviteSettlementItemStats stats = inviteSettlementItemMapper.selectStats(uid, settlementType, time.getLeft(), time.getRight()); 99 + InviteSettlementItemStats stats = inviteSettlementItemMapper.selectStats(uid, statusList, settlementType, time.getLeft(), time.getRight());
99 int totalElements = Objects.isNull(stats.getTotalElements()) ? 0 : stats.getTotalElements(); 100 int totalElements = Objects.isNull(stats.getTotalElements()) ? 0 : stats.getTotalElements();
100 BigDecimal totalOrderAmount = Objects.isNull(stats.getTotalOrderAmount()) ? BigDecimal.ZERO : stats.getTotalOrderAmount(); 101 BigDecimal totalOrderAmount = Objects.isNull(stats.getTotalOrderAmount()) ? BigDecimal.ZERO : stats.getTotalOrderAmount();
101 BigDecimal totalSettleAmount = Objects.isNull(stats.getTotalSettleAmount()) ? BigDecimal.ZERO : stats.getTotalSettleAmount(); 102 BigDecimal totalSettleAmount = Objects.isNull(stats.getTotalSettleAmount()) ? BigDecimal.ZERO : stats.getTotalSettleAmount();
@@ -112,12 +113,11 @@ public class InviteSettlementServiceImpl implements IInviteSettlementService { @@ -112,12 +113,11 @@ public class InviteSettlementServiceImpl implements IInviteSettlementService {
112 .totalWaitPayAmount(formatAmount("￥%s", totalWaitPayAmount)); 113 .totalWaitPayAmount(formatAmount("￥%s", totalWaitPayAmount));
113 if (totalElements == 0) { 114 if (totalElements == 0) {
114 return builder 115 return builder
115 -  
116 .list(Lists.newArrayList()) 116 .list(Lists.newArrayList())
117 .build(); 117 .build();
118 } 118 }
119 int start = (page - 1) * limit; 119 int start = (page - 1) * limit;
120 - List<InviteSettlementItem> list = inviteSettlementItemMapper.select(uid, settlementType, time.getLeft(), time.getRight(), start, limit); 120 + List<InviteSettlementItem> list = inviteSettlementItemMapper.select(uid, statusList, settlementType, time.getLeft(), time.getRight(), start, limit);
121 Map<Integer, Integer> settlementStatusMap = buildInviteSettlementIdStatusMap(uid, list); 121 Map<Integer, Integer> settlementStatusMap = buildInviteSettlementIdStatusMap(uid, list);
122 Map<Integer, String> sellerUidNickNameMap = userProxyService.getNickNameByUids(list.stream() 122 Map<Integer, String> sellerUidNickNameMap = userProxyService.getNickNameByUids(list.stream()
123 .map(InviteSettlementItem::getSellerUid) 123 .map(InviteSettlementItem::getSellerUid)
@@ -143,6 +143,20 @@ public class InviteSettlementServiceImpl implements IInviteSettlementService { @@ -143,6 +143,20 @@ public class InviteSettlementServiceImpl implements IInviteSettlementService {
143 .build(); 143 .build();
144 } 144 }
145 145
  146 + private List<Integer> getStatusList(Integer tab) {
  147 + if (tab == 0) {
  148 + return Lists.newArrayList(1, 3, 4);
  149 + }
  150 + if (tab == 1) {
  151 + return Lists.newArrayList(1, 3);
  152 + }
  153 + if (tab == 2) {
  154 + return Lists.newArrayList(4);
  155 + }
  156 + throwServiceException("参数不正确");
  157 + return Lists.newArrayList();
  158 + }
  159 +
146 private Map<Integer, Integer> buildInviteSettlementIdStatusMap(Integer uid, List<InviteSettlementItem> list) { 160 private Map<Integer, Integer> buildInviteSettlementIdStatusMap(Integer uid, List<InviteSettlementItem> list) {
147 val inviteSettlementIds = list.stream() 161 val inviteSettlementIds = list.stream()
148 .map(InviteSettlementItem::getInviteSettlementId) 162 .map(InviteSettlementItem::getInviteSettlementId)