Showing
5 changed files
with
34 additions
and
1 deletions
@@ -30,7 +30,7 @@ public interface IGoodsService { | @@ -30,7 +30,7 @@ public interface IGoodsService { | ||
30 | 30 | ||
31 | /** | 31 | /** |
32 | * 鉴别为假 | 32 | * 鉴别为假 |
33 | - * @param orderCode | 33 | + * @param appraiseOrder |
34 | */ | 34 | */ |
35 | int appraiseFake(AppraiseOrder appraiseOrder); | 35 | int appraiseFake(AppraiseOrder appraiseOrder); |
36 | 36 | ||
@@ -41,4 +41,6 @@ public interface IGoodsService { | @@ -41,4 +41,6 @@ public interface IGoodsService { | ||
41 | int unsure(AppraiseOrder appraiseOrder); | 41 | int unsure(AppraiseOrder appraiseOrder); |
42 | 42 | ||
43 | OrderAttributes getOrderAttributes(); | 43 | OrderAttributes getOrderAttributes(); |
44 | + | ||
45 | + int shamDeliver(AppraiseOrder appraiseOrder); | ||
44 | } | 46 | } |
@@ -125,4 +125,15 @@ public abstract class AbsGoodsServiceOrderService implements IGoodsService { | @@ -125,4 +125,15 @@ public abstract class AbsGoodsServiceOrderService implements IGoodsService { | ||
125 | logger.info("appraise order appraiseFake update status, orderCode {} rows {}", orderCode, rows); | 125 | logger.info("appraise order appraiseFake update status, orderCode {} rows {}", orderCode, rows); |
126 | return rows; | 126 | return rows; |
127 | } | 127 | } |
128 | + | ||
129 | + @Override | ||
130 | + public int shamDeliver(AppraiseOrder appraiseOrder){ | ||
131 | + long orderCode = appraiseOrder.getOrderCode(); | ||
132 | + AppraiseOrderStatus targetStatus = AppraiseOrderStatus.SHAM_SEND_OUT, | ||
133 | + expectedStatus = AppraiseOrderStatus.SELLER_SEND_OUT; | ||
134 | + | ||
135 | + int rows = triggerStatusChange(orderCode, targetStatus, expectedStatus); | ||
136 | + logger.info("appraise order appraiseFake update status, orderCode {} rows {}", orderCode, rows); | ||
137 | + return rows; | ||
138 | + } | ||
128 | } | 139 | } |
@@ -384,4 +384,6 @@ public class AppraiseOrderService extends AbsGoodsServiceOrderService implements | @@ -384,4 +384,6 @@ public class AppraiseOrderService extends AbsGoodsServiceOrderService implements | ||
384 | public int unsure(AppraiseOrder appraiseOrder){ | 384 | public int unsure(AppraiseOrder appraiseOrder){ |
385 | return super.unsure(appraiseOrder); | 385 | return super.unsure(appraiseOrder); |
386 | } | 386 | } |
387 | + | ||
388 | + | ||
387 | } | 389 | } |
@@ -132,6 +132,9 @@ public class BuyerOrderCancelService { | @@ -132,6 +132,9 @@ public class BuyerOrderCancelService { | ||
132 | @Autowired | 132 | @Autowired |
133 | private ExpressInfoMapper expressInfoMapper; | 133 | private ExpressInfoMapper expressInfoMapper; |
134 | 134 | ||
135 | + @Autowired | ||
136 | + private ServiceOrderProcessor serviceOrderProcessor; | ||
137 | + | ||
135 | @Resource(name = "tradeMqProducer") | 138 | @Resource(name = "tradeMqProducer") |
136 | private YhProducer tradeMqProducer; | 139 | private YhProducer tradeMqProducer; |
137 | 140 | ||
@@ -250,6 +253,13 @@ public class BuyerOrderCancelService { | @@ -250,6 +253,13 @@ public class BuyerOrderCancelService { | ||
250 | } | 253 | } |
251 | 254 | ||
252 | public void cancelForSellerShamSendOut(int uid, long orderCode,OrderStatus targetStatus) { | 255 | public void cancelForSellerShamSendOut(int uid, long orderCode,OrderStatus targetStatus) { |
256 | + | ||
257 | + if (serviceOrderProcessor.isGoodsServiceOrder(orderCode)){ | ||
258 | + logger.info("cancelForSellerShamSendOut isGoodsServiceOrder orderCode {}", orderCode); | ||
259 | + ServiceOrderProcessor.ExistenceNode existenceNode = serviceOrderProcessor.findGoodsServiceInstanceAndExt(orderCode); | ||
260 | + existenceNode.getGoodsService().shamDeliver(existenceNode.getAppraiseOrder()); | ||
261 | + } | ||
262 | + | ||
253 | new BuyerOrderCancelHandler(uid, orderCode) | 263 | new BuyerOrderCancelHandler(uid, orderCode) |
254 | .withBuyerOrderSupplier(buyerOrderMapper, buyerOrderGoodsMapper) | 264 | .withBuyerOrderSupplier(buyerOrderMapper, buyerOrderGoodsMapper) |
255 | .withSellerOrderSupplier(sellerOrderGoodsMapper,sellerOrderMetaMapper) | 265 | .withSellerOrderSupplier(sellerOrderGoodsMapper,sellerOrderMetaMapper) |
1 | package com.yohoufo.order.service.seller.deposit; | 1 | package com.yohoufo.order.service.seller.deposit; |
2 | 2 | ||
3 | +import com.yohobuy.ufo.model.order.common.AppraiseOrderStatus; | ||
3 | import com.yohobuy.ufo.model.order.common.OrderAttributes; | 4 | import com.yohobuy.ufo.model.order.common.OrderAttributes; |
4 | import com.yohobuy.ufo.model.order.common.OrderCodeType; | 5 | import com.yohobuy.ufo.model.order.common.OrderCodeType; |
5 | import com.yohobuy.ufo.model.order.req.*; | 6 | import com.yohobuy.ufo.model.order.req.*; |
@@ -238,4 +239,11 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple | @@ -238,4 +239,11 @@ public class SellerDepositOrderService extends AbsGoodsServiceOrderService imple | ||
238 | depositService.insertFakeDeposit(appraiseOrder.getUid(), appraiseOrder.getOrderCode(), appraiseOrder.getParentOrderCode()); | 239 | depositService.insertFakeDeposit(appraiseOrder.getUid(), appraiseOrder.getOrderCode(), appraiseOrder.getParentOrderCode()); |
239 | return rows; | 240 | return rows; |
240 | } | 241 | } |
242 | + | ||
243 | + @Override | ||
244 | + public int shamDeliver(AppraiseOrder appraiseOrder){ | ||
245 | + int rows = super.shamDeliver(appraiseOrder); | ||
246 | + depositService.insertFakeDeposit(appraiseOrder.getUid(), appraiseOrder.getOrderCode(), appraiseOrder.getParentOrderCode()); | ||
247 | + return rows; | ||
248 | + } | ||
241 | } | 249 | } |
-
Please register or login to post a comment