|
@@ -90,8 +90,8 @@ public class StandardOrderJob {
|
|
|
|
|
|
|
|
|
com.zswl.cloud.shop.client.ret.ResultContent<CalculateVo> calculate = goodsService.calculate(calculateCouponDto);
|
|
|
- if (!calculate.getState().equals(ResultState.Success)){
|
|
|
- resultContent.set(ResultContent.build(com.github.microservice.auth.client.content.ResultState.Fail,calculate.getMsg()));
|
|
|
+ if (!calculate.getState().equals(ResultState.Success)) {
|
|
|
+ resultContent.set(ResultContent.build(com.github.microservice.auth.client.content.ResultState.Fail, calculate.getMsg()));
|
|
|
stop.set(true);
|
|
|
return RepeatStatus.FINISHED;
|
|
|
}
|
|
@@ -142,7 +142,7 @@ public class StandardOrderJob {
|
|
|
}
|
|
|
|
|
|
|
|
|
- resultContent.set(ResultContent.build(com.github.microservice.auth.client.content.ResultState.Fail,resultContent1.getMsg()));
|
|
|
+ resultContent.set(ResultContent.build(com.github.microservice.auth.client.content.ResultState.Fail, resultContent1.getMsg()));
|
|
|
stop.set(true);
|
|
|
|
|
|
return RepeatStatus.FINISHED;
|
|
@@ -154,10 +154,24 @@ public class StandardOrderJob {
|
|
|
public Step platformOrder() {
|
|
|
return stepBuilderFactory.get("standardPlatformOrder")
|
|
|
.tasklet((contribution, chunkContext) -> {
|
|
|
- if (stop.get()){
|
|
|
+ if (stop.get()) {
|
|
|
return RepeatStatus.FINISHED;
|
|
|
}
|
|
|
- getResultContent().set(orderService2.creat(getParameter().get()));
|
|
|
+
|
|
|
+ CreateOrder2Model createOrder2Model = getParameter().get();
|
|
|
+
|
|
|
+ ResultContent creat = orderService2.creat(createOrder2Model);
|
|
|
+ getResultContent().set(creat);
|
|
|
+
|
|
|
+ if (!creat.getState().equals(com.github.microservice.auth.client.content.ResultState.Success)) {
|
|
|
+ OperateStockDto operateStockDto = new OperateStockDto();
|
|
|
+ operateStockDto.setUserId(createOrder2Model.getUserId());
|
|
|
+ operateStockDto.setOperate(2);// 暂用库存
|
|
|
+ operateStockDto.setShopId(createOrder2Model.getShopId());
|
|
|
+ operateStockDto.setGoodsId(createOrder2Model.getGoodsList().get(0).getGoodsId());
|
|
|
+ goodsService.operateStock(operateStockDto);
|
|
|
+ }
|
|
|
+
|
|
|
return RepeatStatus.FINISHED;
|
|
|
})
|
|
|
.build();
|