提交修改
This commit is contained in:
parent
387eb33edd
commit
b0b4fdac5a
File diff suppressed because it is too large
Load Diff
@ -49,7 +49,7 @@ public class MysqlMain_update {
|
|||||||
List<TablesBean> list = new ArrayList<TablesBean>();
|
List<TablesBean> list = new ArrayList<TablesBean>();
|
||||||
|
|
||||||
|
|
||||||
String a = "vv_app_category";
|
String a = "vv_trade_order_line";
|
||||||
for (String s : a.split(",")) {
|
for (String s : a.split(",")) {
|
||||||
list.add(new TablesBean(s));
|
list.add(new TablesBean(s));
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,7 +17,6 @@ public class AppOrderRequest {
|
|||||||
* 买家id
|
* 买家id
|
||||||
*/
|
*/
|
||||||
private Long buyerId;
|
private Long buyerId;
|
||||||
|
|
||||||
/***
|
/***
|
||||||
* 订单号id
|
* 订单号id
|
||||||
*/
|
*/
|
||||||
@ -41,7 +40,6 @@ public class AppOrderRequest {
|
|||||||
// wait_pay:待支付,待发货:wait_shipping, 已经发货: shipping , 已接收,delivered
|
// wait_pay:待支付,待发货:wait_shipping, 已经发货: shipping , 已接收,delivered
|
||||||
private String status;
|
private String status;
|
||||||
|
|
||||||
|
|
||||||
/***
|
/***
|
||||||
* 逆向状态
|
* 逆向状态
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -214,6 +214,7 @@ public class AppOrderController {
|
|||||||
vvTradeOrderLineEntity.setStatus(OrderStatusEnums.wait_pay.getStatus());
|
vvTradeOrderLineEntity.setStatus(OrderStatusEnums.wait_pay.getStatus());
|
||||||
vvTradeOrderLineEntity.setProductId(vvSkuEntity.getProductId());
|
vvTradeOrderLineEntity.setProductId(vvSkuEntity.getProductId());
|
||||||
vvTradeOrderLineEntity.setProductName(vvProduct.getTitle());
|
vvTradeOrderLineEntity.setProductName(vvProduct.getTitle());
|
||||||
|
vvTradeOrderLineEntity.setPromotionPrice(vvSkuEntity.getPromotionPrice());
|
||||||
vvTradeOrderLineEntity.setProductMainImageUrl(vvProduct.getMainImageUrl());
|
vvTradeOrderLineEntity.setProductMainImageUrl(vvProduct.getMainImageUrl());
|
||||||
vvTradeOrderLineEntity.setSkuInfo(JSON.toJSONString(propertyNameValues));
|
vvTradeOrderLineEntity.setSkuInfo(JSON.toJSONString(propertyNameValues));
|
||||||
vvTradeOrderLineEntityList.add(vvTradeOrderLineEntity);
|
vvTradeOrderLineEntityList.add(vvTradeOrderLineEntity);
|
||||||
|
|||||||
@ -32,6 +32,7 @@ public class AppUploadOssController {
|
|||||||
* <p>
|
* <p>
|
||||||
* http://localhost:8888/app/upload/file file
|
* http://localhost:8888/app/upload/file file
|
||||||
*/
|
*/
|
||||||
|
// todo
|
||||||
@PostMapping("/file")
|
@PostMapping("/file")
|
||||||
public R uploadFile(HttpServletRequest request, HttpServletResponse response, @RequestParam("file") MultipartFile file) {
|
public R uploadFile(HttpServletRequest request, HttpServletResponse response, @RequestParam("file") MultipartFile file) {
|
||||||
List<Map<String, Object>> data = ossFileUploadService.uploadImages(new MultipartFile[]{file});
|
List<Map<String, Object>> data = ossFileUploadService.uploadImages(new MultipartFile[]{file});
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user