ufo / yohoufo-fore · Commits

Go to a project

Authored by Lixiaodi
Commit fee5eef3e8f085c6132fccc09beb1cdd013acaad 1 parent dac25335

增加日志

Inline Side-by-side
Showing 6 changed files with 59 additions and 4 deletions
@@ -42,4 +42,6 @@ public interface StorageDepositMapper { @@ -42,4 +42,6 @@ public interface StorageDepositMapper {
42 42
43 int getDepositOffShelvesCount(@Param("uid") Integer uid, @Param("storageId") Integer storageId); 43 int getDepositOffShelvesCount(@Param("uid") Integer uid, @Param("storageId") Integer storageId);
44 StorageDeposit selectByDepositCode(@Param("uid") int uid, @Param("depositCode")String depositCode); 44 StorageDeposit selectByDepositCode(@Param("uid") int uid, @Param("depositCode")String depositCode);
  45 +
  46 + List<StorageDeposit> getDepositOffs(@Param("uid") Integer uid, @Param("storageId") Integer storageId, @Param("count") Integer count);
45 } 47 }
1 package com.yohoufo.dal.order.model; 1 package com.yohoufo.dal.order.model;
2 2
  3 +import lombok.ToString;
  4 +
  5 +@ToString
3 public class StorageDeposit { 6 public class StorageDeposit {
4 private Integer id; 7 private Integer id;
5 8
1 package com.yohoufo.dal.order.model; 1 package com.yohoufo.dal.order.model;
2 2
3 import lombok.Data; 3 import lombok.Data;
  4 +import lombok.ToString;
4 5
5 @Data 6 @Data
  7 +@ToString
6 public class StorageDepositCount { 8 public class StorageDepositCount {
7 9
8 private Integer productId; 10 private Integer productId;
@@ -325,6 +325,11 @@ @@ -325,6 +325,11 @@
325 where owner_uid = #{uid} and status=1 and order_status=0 and del_status=0 and storage_id = #{storageId} 325 where owner_uid = #{uid} and status=1 and order_status=0 and del_status=0 and storage_id = #{storageId}
326 </select> 326 </select>
327 327
  328 + <select id="getDepositOffs" resultMap="BaseResultMap">
  329 + select * from storage_deposit
  330 + where owner_uid = #{uid} and storage_id = #{storageId} and status=1 and order_status=0 and del_status=0 limit 0, #{count}
  331 + </select>
  332 +
328 <select id="selectByDepositCode" resultMap="BaseResultMap"> 333 <select id="selectByDepositCode" resultMap="BaseResultMap">
329 select <include refid="Base_Column_List" /> from storage_deposit 334 select <include refid="Base_Column_List" /> from storage_deposit
330 where owner_uid = #{uid} and status = 1 and del_status= 0 AND deposit_code = #{depositCode,jdbcType=VARCHAR} limit 1 335 where owner_uid = #{uid} and status = 1 and del_status= 0 AND deposit_code = #{depositCode,jdbcType=VARCHAR} limit 1
@@ -23,11 +23,17 @@ public interface DepositService { @@ -23,11 +23,17 @@ public interface DepositService {
23 boolean changeSaleStatusOn(Integer uid, String depositCode, Integer skup); 23 boolean changeSaleStatusOn(Integer uid, String depositCode, Integer skup);
24 // 下架 24 // 下架
25 boolean changeSaleStatusOff(Integer uid, Integer skup); 25 boolean changeSaleStatusOff(Integer uid, Integer skup);
  26 +
  27 + // 批量上架
  28 + List<StorageDeposit> changeSaleStatusOnBatch(Integer uid, Integer storageId, List<Integer> skupList);
  29 + // 批量下架
  30 + List<Integer> changeSaleStatusOffBatch(Integer uid, List<Integer> skupList);
  31 +
  32 +
26 // 转卖 33 // 转卖
27 boolean changeOwner(Integer uid, Integer skup, long buyOrderCode, Integer newUid); 34 boolean changeOwner(Integer uid, Integer skup, long buyOrderCode, Integer newUid);
28 // 可上架数量 35 // 可上架数量
29 int getDepositOffShelvesCount(Integer uid, Integer storageId); 36 int getDepositOffShelvesCount(Integer uid, Integer storageId);
30 // 剩余存储天数 37 // 剩余存储天数
31 int getRemainDay(Integer uid, String depositCode); 38 int getRemainDay(Integer uid, String depositCode);
32 -  
33 } 39 }
@@ -49,7 +49,9 @@ public class DepositServiceImpl implements DepositService { @@ -49,7 +49,9 @@ public class DepositServiceImpl implements DepositService {
49 return new ArrayList<>(); 49 return new ArrayList<>();
50 } 50 }
51 List<Integer> productIdList = storageDepositMapper.queryUserDepositProductId(uid, (page - 1) * limit, limit); 51 List<Integer> productIdList = storageDepositMapper.queryUserDepositProductId(uid, (page - 1) * limit, limit);
  52 + LOGGER.info("productIdList is {}", productIdList);
52 List<StorageDepositCount> countInfoList = storageDepositMapper.queryUserDepositProduct(uid, productIdList); 53 List<StorageDepositCount> countInfoList = storageDepositMapper.queryUserDepositProduct(uid, productIdList);
  54 + LOGGER.info("countInfoList is {}", countInfoList);
53 List<Integer> skupList = countInfoList.stream().map(StorageDepositCount::getSkup).collect(Collectors.toList()); 55 List<Integer> skupList = countInfoList.stream().map(StorageDepositCount::getSkup).collect(Collectors.toList());
54 List<SellerOrderGoods> goodsList = sellerOrderGoodsMapper.selectBySkups(skupList); 56 List<SellerOrderGoods> goodsList = sellerOrderGoodsMapper.selectBySkups(skupList);
55 Map<Integer, StorageDepositCount> countInfoMap = countInfoList.stream().map(Function.identity()).collect(Collectors.toMap(StorageDepositCount::getProductId, Function.identity())); 57 Map<Integer, StorageDepositCount> countInfoMap = countInfoList.stream().map(Function.identity()).collect(Collectors.toMap(StorageDepositCount::getProductId, Function.identity()));
@@ -164,23 +166,57 @@ public class DepositServiceImpl implements DepositService { @@ -164,23 +166,57 @@ public class DepositServiceImpl implements DepositService {
164 // 上架 166 // 上架
165 @Override 167 @Override
166 public boolean changeSaleStatusOn(Integer uid, String depositCode, Integer skup) { 168 public boolean changeSaleStatusOn(Integer uid, String depositCode, Integer skup) {
  169 + LOGGER.info("changeSaleStatusOn uid {}， depositCode is {}, skup is {}", uid, depositCode, skup);
167 return storageDepositMapper.changeSaleStatusOn(uid, depositCode, skup) == 1; 170 return storageDepositMapper.changeSaleStatusOn(uid, depositCode, skup) == 1;
168 } 171 }
169 // 下架 172 // 下架
170 @Override 173 @Override
171 public boolean changeSaleStatusOff(Integer uid, Integer skup) { 174 public boolean changeSaleStatusOff(Integer uid, Integer skup) {
  175 + LOGGER.info("changeSaleStatusOff uid {}， skup is {}", uid, skup);
172 return storageDepositMapper.changeSaleStatusOff(uid, skup) == 1; 176 return storageDepositMapper.changeSaleStatusOff(uid, skup) == 1;
173 } 177 }
  178 +
  179 +
  180 + // 批量上架
  181 + public List<StorageDeposit> changeSaleStatusOnBatch(Integer uid, Integer storageId, List<Integer> skupList) {
  182 + int count = skupList.size();
  183 + List<StorageDeposit> sdList = storageDepositMapper.getDepositOffs(uid, storageId, count);
  184 + List<StorageDeposit> successList = new ArrayList<>();
  185 + for (int i = 0; i < sdList.size(); i++) {
  186 + StorageDeposit sd = sdList.get(i);
  187 + if (changeSaleStatusOn(uid, sd.getDepositCode(), skupList.get(i))) {
  188 + LOGGER.info("changeSaleStatusOn success! uid {}，depositeCode is {}, skup is {}", uid, sd.getDepositCode(), skupList.get(i));
  189 + sd.setNewSkup(skupList.get(i));
  190 + successList.add(sd);
  191 + }
  192 + }
  193 + return successList;
  194 + }
  195 +
  196 + // 批量下架
  197 + public List<Integer> changeSaleStatusOffBatch(Integer uid, List<Integer> skupList) {
  198 + List<Integer> successList = new ArrayList<>();
  199 + for (Integer skup : skupList) {
  200 + if (changeSaleStatusOff(uid, skup)) {
  201 + LOGGER.info("changeSaleStatusOff success! uid {}， skup is {}", uid, skup);
  202 + successList.add(skup);
  203 + }
  204 + }
  205 + return successList;
  206 + }
  207 +
174 // 转卖 208 // 转卖
175 @Override 209 @Override
176 public boolean changeOwner(Integer uid, Integer skup, long buyOrderCode, Integer newUid) { 210 public boolean changeOwner(Integer uid, Integer skup, long buyOrderCode, Integer newUid) {
  211 + LOGGER.info("changeOwner success! uid {}， skup is {}， buyOrderCode is {}, newUid is {}", uid, skup, buyOrderCode, newUid);
177 StorageDeposit sd = storageDepositMapper.queryByOwnerSkup(uid, skup); 212 StorageDeposit sd = storageDepositMapper.queryByOwnerSkup(uid, skup);
178 - if(sd==null) { 213 + if (sd == null) {
179 return false; 214 return false;
180 } 215 }
181 - if(storageDepositMapper.sale(uid, skup, buyOrderCode) == 0) { 216 + if (storageDepositMapper.sale(uid, skup, buyOrderCode) == 0) {
182 return false; 217 return false;
183 } 218 }
  219 + LOGGER.info("sale success! uid {}， skup is {}， buyOrderCode is {}, newUid is {}", uid, skup, buyOrderCode, newUid);
184 sd.setId(null); 220 sd.setId(null);
185 sd.setOwnerUid(newUid); 221 sd.setOwnerUid(newUid);
186 sd.setOrderCode(buyOrderCode); 222 sd.setOrderCode(buyOrderCode);
@@ -188,10 +224,11 @@ public class DepositServiceImpl implements DepositService { @@ -188,10 +224,11 @@ public class DepositServiceImpl implements DepositService {
188 sd.setStatus(1); 224 sd.setStatus(1);
189 sd.setOrderStatus(0); 225 sd.setOrderStatus(0);
190 sd.setUpdateTime(0); 226 sd.setUpdateTime(0);
191 - int now = (int) (System.currentTimeMillis()/1000); 227 + int now = (int) (System.currentTimeMillis() / 1000);
192 sd.setCreateTime(now); 228 sd.setCreateTime(now);
193 sd.setDepositStartTime(now); 229 sd.setDepositStartTime(now);
194 sd.setDepositEndTime(now + DEPOSIT_MAX_TIME); 230 sd.setDepositEndTime(now + DEPOSIT_MAX_TIME);
  231 + LOGGER.info("new owner record is sd", sd);
195 storageDepositMapper.insert(sd); 232 storageDepositMapper.insert(sd);
196 return true; 233 return true;
197 } 234 }