提交 f454b5d3 authored 作者: 吴德鹏's avatar 吴德鹏

修改订单来源bug

上级 cf6a7e88
...@@ -198,7 +198,8 @@ public class OrderController extends Controller { ...@@ -198,7 +198,8 @@ public class OrderController extends Controller {
@RequestParam(value = "itemNum", required = false) Integer itemNum, @RequestParam(value = "itemNum", required = false) Integer itemNum,
@RequestParam(value = "itemSku", required = false) String itemSku, @RequestParam(value = "itemSku", required = false) String itemSku,
@RequestParam(value = "itemSkuId", required = false) String itemSkuId, @RequestParam(value = "itemSkuId", required = false) String itemSkuId,
@RequestParam(value = "web", required = false) String web) throws IOException, URISyntaxException, ExecutionException, InterruptedException, TimeoutException { @RequestParam(value = "orderSource", required = false) Integer orderSource
) throws IOException, URISyntaxException, ExecutionException, InterruptedException, TimeoutException {
TbCfUserInfo user = this.user.user(); TbCfUserInfo user = this.user.user();
String userId = user.getUserId(); String userId = user.getUserId();
...@@ -308,11 +309,8 @@ public class OrderController extends Controller { ...@@ -308,11 +309,8 @@ public class OrderController extends Controller {
order.setUserId(userId); order.setUserId(userId);
if ("web".equals(web)) {
order.setOrderSource(3); order.setOrderSource(orderSource);
} else {
order.setOrderSource(1);
}
order.getItemOrderListFromCartList(allByUserId, itemRepository); order.getItemOrderListFromCartList(allByUserId, itemRepository);
......
server.servlet.context-path=/zion server.servlet.context-path=/zion
spring.jpa.hibernate.ddl-auto=update spring.jpa.hibernate.ddl-auto=update
server.port = 7000 server.port=8083
spring.profiles.active=test spring.profiles.active=test
#spring.datasource.url=jdbc:mysql://${MYSQL_HOST:localhost}:3306/afrishop_test?useUnicode=true&connectionCollation=utf8mb4_general_ci&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC #spring.datasource.url=jdbc:mysql://${MYSQL_HOST:localhost}:3306/afrishop_test?useUnicode=true&connectionCollation=utf8mb4_general_ci&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC
#spring.datasource.username=root #spring.datasource.username=root
#spring.datasource.password=Diaoyunnuli.8 #spring.datasource.password=Diaoyunnuli.8
#spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect #spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect
spring.datasource.connectionInitSql: SET NAMES 'utf8mb4' spring.datasource.connectionInitSql:SET NAMES 'utf8mb4'
#spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect #spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect
security.oauth2.resource.filter-order=3 security.oauth2.resource.filter-order=3
security.signing-key=MaYzkSjmkzPC57L security.signing-key=MaYzkSjmkzPC57L
...@@ -21,9 +21,7 @@ security.jwt.scope-write=write ...@@ -21,9 +21,7 @@ security.jwt.scope-write=write
security.jwt.resource-ids=testjwtresourceid security.jwt.resource-ids=testjwtresourceid
spring.servlet.multipart.max-file-size=456128KB spring.servlet.multipart.max-file-size=456128KB
spring.servlet.multipart.max-request-size=456128KB spring.servlet.multipart.max-request-size=456128KB
# App Properties # App Properties
bezkoder.app.jwtSecret= bezKoderSecretKey bezkoder.app.jwtSecret=bezKoderSecretKey
bezkoder.app.jwtExpirationMs= 86400000 bezkoder.app.jwtExpirationMs=86400000
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论