|
@@ -42,7 +42,6 @@ public class OrderController {
|
|
OrderServiceImp orderServiceImp;
|
|
OrderServiceImp orderServiceImp;
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
@ApiOperation("创建订单")
|
|
@ApiOperation("创建订单")
|
|
@ResourceAuth(value = AuthConstant.User, type = AuthType.User)
|
|
@ResourceAuth(value = AuthConstant.User, type = AuthType.User)
|
|
@RequestMapping(value = "creat", method = RequestMethod.POST)
|
|
@RequestMapping(value = "creat", method = RequestMethod.POST)
|
|
@@ -74,7 +73,7 @@ public class OrderController {
|
|
@ApiOperation("创建扫码订单")
|
|
@ApiOperation("创建扫码订单")
|
|
@ResourceAuth(value = "user", type = AuthType.User)
|
|
@ResourceAuth(value = "user", type = AuthType.User)
|
|
@RequestMapping(value = "creatScanOrder", method = RequestMethod.POST)
|
|
@RequestMapping(value = "creatScanOrder", method = RequestMethod.POST)
|
|
- public ResultContent<CreateResponseModel> creatScanOrder(@Valid @RequestBody ScanModel scanModel){
|
|
|
|
|
|
+ public ResultContent<CreateResponseModel> creatScanOrder(@Valid @RequestBody ScanModel scanModel) {
|
|
|
|
|
|
String userId = authHelper.getCurrentUser().getUserId();
|
|
String userId = authHelper.getCurrentUser().getUserId();
|
|
|
|
|
|
@@ -97,8 +96,7 @@ public class OrderController {
|
|
goods.setTransferType(TransferType.RATIO);
|
|
goods.setTransferType(TransferType.RATIO);
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
- goods.setGoodsInfo(new JSONObject().set("goodsName","二维码商品"));
|
|
|
|
|
|
+ goods.setGoodsInfo(new JSONObject().set("goodsName", "二维码商品"));
|
|
|
|
|
|
// todo 店铺分账规则
|
|
// todo 店铺分账规则
|
|
// 平台分账
|
|
// 平台分账
|
|
@@ -112,14 +110,14 @@ public class OrderController {
|
|
shop.setValue(BigDecimal.valueOf(100));
|
|
shop.setValue(BigDecimal.valueOf(100));
|
|
shop.setShopId(createOrder2Model.getShopId());
|
|
shop.setShopId(createOrder2Model.getShopId());
|
|
|
|
|
|
- goods.setTransferRrule(List.of(plat,shop));
|
|
|
|
|
|
+ goods.setTransferRrule(List.of(plat, shop));
|
|
goods.setExtend(scanModel.getExtend());
|
|
goods.setExtend(scanModel.getExtend());
|
|
createOrder2Model.setGoodsList(List.of(goods));
|
|
createOrder2Model.setGoodsList(List.of(goods));
|
|
|
|
|
|
|
|
|
|
createOrder2Model.setGoodsList(List.of(goods));
|
|
createOrder2Model.setGoodsList(List.of(goods));
|
|
|
|
|
|
- return orderServiceImp.creat(createOrder2Model);
|
|
|
|
|
|
+ return orderServiceImp.creat(createOrder2Model);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|