xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-10-02 02:06:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

!195 add remark

Browse Source 
Merge pull request !195 from Admin/sit-Carl
This commit is contained in:
Admin 2022-02-21 03:51:50 +00:00 committed by Gitee
commit fd37a91a41
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rc-busness/pages/personal/settlement.vue
View File

@ -641,6 +641,7 @@ export default {
"_trackCustomEvent", "_trackCustomEvent",
"placing_order", "placing_order",
{ {
//TODO order id add here
"product_id":item.productCode, "product_id":item.productCode,
"product_name": item.productName, "product_name": item.productName,
"product_quantity" : item.buyCount, "product_quantity" : item.buyCount,

3
rc-busness/pages/userlogin/login.vue
View File

@ -425,7 +425,7 @@ export default {
"register", "register",
{} {}
]) ])
/*
let curEnv = process.env.NODE_ENV; let curEnv = process.env.NODE_ENV;
let newGuestCouponCodes = envData[curEnv].newGuestCoupon; let newGuestCouponCodes = envData[curEnv].newGuestCoupon;
let couponId=newGuestCouponCodes[0]; let couponId=newGuestCouponCodes[0];
@ -439,6 +439,7 @@ export default {
setTimeout(() => { setTimeout(() => {
this.serdiscount(this.tel,newGuestCouponCodes[3]); this.serdiscount(this.tel,newGuestCouponCodes[3]);
}, 500); }, 500);
*/
} }
this.$router.push({ this.$router.push({
path: "/", path: "/",

3
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java
View File

@ -61,6 +61,7 @@ public class OrderController {
public ResponseDTO<Map<String, String>> generateOrderWX(@RequestBody List<OrdersEntity> ordersEntityList) throws Exception { public ResponseDTO<Map<String, String>> generateOrderWX(@RequestBody List<OrdersEntity> ordersEntityList) throws Exception {
StringBuffer productId = new StringBuffer(); StringBuffer productId = new StringBuffer();
StringBuffer productName = new StringBuffer(); StringBuffer productName = new StringBuffer();
StringBuffer remark = new StringBuffer();
String memberId = ""; String memberId = "";
String mobile = ""; String mobile = "";
int buyCount = 0; int buyCount = 0;
@ -112,6 +113,7 @@ public class OrderController {
orderAddress.setAddressProvinceName(ordersEntitys.getOrderAddress().getAddressProvinceName()); orderAddress.setAddressProvinceName(ordersEntitys.getOrderAddress().getAddressProvinceName());
productId.append(ordersEntitys.getProductCode() + ","); productId.append(ordersEntitys.getProductCode() + ",");
productName.append(ordersEntitys.getProductName() + ","); productName.append(ordersEntitys.getProductName() + ",");
remark.append(ordersEntitys.getBasePoint() + ",");
memberId = ordersEntitys.getMemberId(); memberId = ordersEntitys.getMemberId();
mobile = ordersEntitys.getPhoneNumber(); mobile = ordersEntitys.getPhoneNumber();
buyCount = buyCount + ordersEntitys.getBuyCount(); buyCount = buyCount + ordersEntitys.getBuyCount();
@ -126,6 +128,7 @@ public class OrderController {
ordersEntity.setOrderNo(GenerateSequenceUtil.generateSequenceNo()); ordersEntity.setOrderNo(GenerateSequenceUtil.generateSequenceNo());
ordersEntity.setOrderStatus("0"); ordersEntity.setOrderStatus("0");
ordersEntity.setBasePoint(basePoint); ordersEntity.setBasePoint(basePoint);
ordersEntity.setRemark(remark.substring(0,remark.length() - 1));
int result = orderService.generateOrder(ordersEntity, orderDatilListJson); int result = orderService.generateOrder(ordersEntity, orderDatilListJson);
if (result == 1) { if (result == 1) {
System.out.println("orderService.generateOrder(ordersEntity, orderDatilListJson) == 1"); System.out.println("orderService.generateOrder(ordersEntity, orderDatilListJson) == 1");

2
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/model/OrderEntity.java
View File

@ -42,4 +42,6 @@ public class OrderEntity {
private String payType="1"; private String payType="1";
private String basePoint; private String basePoint;
private String remark;
} }

2
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/model/OrdersEntity.java
View File

@ -43,4 +43,6 @@ public class OrdersEntity {
private Double basePoint = 0.0; private Double basePoint = 0.0;
private String remark;
} }