Showing
4 changed files
with
27 additions
and
13 deletions
@@ -123,4 +123,12 @@ public class SellerController { | @@ -123,4 +123,12 @@ public class SellerController { | ||
123 | return new ApiResponse.ApiResponseBuilder().data(data).code(200).message(msg).build(); | 123 | return new ApiResponse.ApiResponseBuilder().data(data).code(200).message(msg).build(); |
124 | } | 124 | } |
125 | 125 | ||
126 | + @RequestMapping(params = "method=ufo.order.isSurperEntrySeller") | ||
127 | + @ResponseBody | ||
128 | + public ApiResponse isSuperEntrySeller(@RequestParam("uid") int uid) { | ||
129 | + | ||
130 | + boolean isSuper = sellerService.isSuperEntrySeller(uid); | ||
131 | + return new ApiResponse.ApiResponseBuilder().code(200).data(isSuper).message("刷新成功").build(); | ||
132 | + } | ||
133 | + | ||
126 | } | 134 | } |
@@ -455,16 +455,18 @@ public class SellerOrderController { | @@ -455,16 +455,18 @@ public class SellerOrderController { | ||
455 | return new ApiResponse.ApiResponseBuilder().code(200).data(orderListInfoRsp).message("刷新成功").build(); | 455 | return new ApiResponse.ApiResponseBuilder().code(200).data(orderListInfoRsp).message("刷新成功").build(); |
456 | } | 456 | } |
457 | 457 | ||
458 | - @RequestMapping(params = "method=ufo.order.isSurperEntrySeller") | ||
459 | - @ResponseBody | ||
460 | - public ApiResponse isSuperEntrySeller(@RequestParam("uid") int uid) { | ||
461 | - | ||
462 | - boolean isSuper = sellerService.isSuperEntrySeller(uid); | ||
463 | - return new ApiResponse.ApiResponseBuilder().code(200).data(isSuper).message("刷新成功").build(); | ||
464 | - } | ||
465 | - | 458 | + /** |
459 | + * @version 6.8.3 | ||
460 | + * @param type | ||
461 | + * @param uid | ||
462 | + * @param skupList | ||
463 | + * @param page | ||
464 | + * @param limit | ||
465 | + * @return | ||
466 | + */ | ||
466 | @RequestMapping(params = "method=ufo.seller.orderList") | 467 | @RequestMapping(params = "method=ufo.seller.orderList") |
467 | @ResponseBody | 468 | @ResponseBody |
469 | + @Deprecated | ||
468 | public ApiResponse getOrderList(@RequestParam("type") int type, | 470 | public ApiResponse getOrderList(@RequestParam("type") int type, |
469 | @RequestParam("uid") int uid, | 471 | @RequestParam("uid") int uid, |
470 | @RequestParam(name = "skupList")String skupList, | 472 | @RequestParam(name = "skupList")String skupList, |
@@ -514,7 +516,6 @@ public class SellerOrderController { | @@ -514,7 +516,6 @@ public class SellerOrderController { | ||
514 | * @param price | 516 | * @param price |
515 | * @param address_id | 517 | * @param address_id |
516 | * @return | 518 | * @return |
517 | - * @throws GatewayException | ||
518 | */ | 519 | */ |
519 | @RequestMapping(params = "method=ufo.seller.publishImperfectPrd") | 520 | @RequestMapping(params = "method=ufo.seller.publishImperfectPrd") |
520 | @ResponseBody | 521 | @ResponseBody |
@@ -775,12 +775,13 @@ public class SellerOrderService implements IOrderListService, IOrderDetailServic | @@ -775,12 +775,13 @@ public class SellerOrderService implements IOrderListService, IOrderDetailServic | ||
775 | } | 775 | } |
776 | List<SellerOrderGoods> psogList = null; | 776 | List<SellerOrderGoods> psogList = null; |
777 | //TODO refresh change price case of not entry seller | 777 | //TODO refresh change price case of not entry seller |
778 | - psogList = skupListService.getRefreshOfNESCP(pso); | 778 | + psogList = skupListService.getSingleChangePriceGoods(pso); |
779 | int skup = pso.getSkup(); | 779 | int skup = pso.getSkup(); |
780 | SellerOrderGoods psog = sellerOrderGoodsMapper.selectByPrimaryKey(skup); | 780 | SellerOrderGoods psog = sellerOrderGoodsMapper.selectByPrimaryKey(skup); |
781 | Long bn = psog.getBatchNo(); | 781 | Long bn = psog.getBatchNo(); |
782 | if (CollectionUtils.isEmpty(psogList)) { | 782 | if (CollectionUtils.isEmpty(psogList)) { |
783 | - psogList = sellerOrderGoodsMapper.selectByUidBNStatusGBBPSList(uid, bn, statusList); | 783 | + psogList = new ArrayList<>(1); |
784 | + psogList.add(psog); | ||
784 | } | 785 | } |
785 | 786 | ||
786 | if (CollectionUtils.isEmpty(psogList)){ | 787 | if (CollectionUtils.isEmpty(psogList)){ |
@@ -590,8 +590,12 @@ public class SkupListService { | @@ -590,8 +590,12 @@ public class SkupListService { | ||
590 | return orderListInfo; | 590 | return orderListInfo; |
591 | } | 591 | } |
592 | 592 | ||
593 | - | ||
594 | - public List<SellerOrderGoods> getRefreshOfNESCP(SellerOrder pso){ | 593 | + /** |
594 | + * 单个商品变价相关商品 | ||
595 | + * @param pso | ||
596 | + * @return | ||
597 | + */ | ||
598 | + public List<SellerOrderGoods> getSingleChangePriceGoods(SellerOrder pso){ | ||
595 | // | 599 | // |
596 | long orderCode = pso.getOrderCode(); | 600 | long orderCode = pso.getOrderCode(); |
597 | //变价产生的新订单号 | 601 | //变价产生的新订单号 |
-
Please register or login to post a comment