From 9244fbec3d40666488d1a10f64731b20c4550939 Mon Sep 17 00:00:00 2001 From: Vion Date: Mon, 21 Feb 2022 11:12:34 +0800 Subject: [PATCH 1/3] Stop senting new registeration coupon --- rc-busness/pages/personal/settlement.vue | 1 + rc-busness/pages/userlogin/login.vue | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/rc-busness/pages/personal/settlement.vue b/rc-busness/pages/personal/settlement.vue index 26851153..38508112 100644 --- a/rc-busness/pages/personal/settlement.vue +++ b/rc-busness/pages/personal/settlement.vue @@ -641,6 +641,7 @@ export default { "_trackCustomEvent", "placing_order", { + //TODO order id add here "product_id":item.productCode, "product_name": item.productName, "product_quantity" : item.buyCount, diff --git a/rc-busness/pages/userlogin/login.vue b/rc-busness/pages/userlogin/login.vue index 2f89f4ae..8fc4d7a5 100644 --- a/rc-busness/pages/userlogin/login.vue +++ b/rc-busness/pages/userlogin/login.vue @@ -425,7 +425,7 @@ export default { "register", {} ]) - + /* let curEnv = process.env.NODE_ENV; let newGuestCouponCodes = envData[curEnv].newGuestCoupon; let couponId=newGuestCouponCodes[0]; @@ -439,6 +439,7 @@ export default { setTimeout(() => { this.serdiscount(this.tel,newGuestCouponCodes[3]); }, 500); + */ } this.$router.push({ path: "/", From fe5eb1373bf77c80cee6d83f1d54190f47616099 Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Mon, 21 Feb 2022 11:15:04 +0800 Subject: [PATCH 2/3] add remark value; --- .../module/system/royalcanin/good/OrderController.java | 3 +++ .../module/system/royalcanin/good/model/OrdersEntity.java | 2 ++ 2 files changed, 5 insertions(+) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java index 9f25a2ec..70c8e472 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java @@ -61,6 +61,7 @@ public class OrderController { public ResponseDTO> generateOrderWX(@RequestBody List ordersEntityList) throws Exception { StringBuffer productId = new StringBuffer(); StringBuffer productName = new StringBuffer(); + StringBuffer remark = new StringBuffer(); String memberId = ""; String mobile = ""; int buyCount = 0; @@ -112,6 +113,7 @@ public class OrderController { orderAddress.setAddressProvinceName(ordersEntitys.getOrderAddress().getAddressProvinceName()); productId.append(ordersEntitys.getProductCode() + ","); productName.append(ordersEntitys.getProductName() + ","); + remark.append(ordersEntitys.getBasePoint() + ","); memberId = ordersEntitys.getMemberId(); mobile = ordersEntitys.getPhoneNumber(); buyCount = buyCount + ordersEntitys.getBuyCount(); @@ -126,6 +128,7 @@ public class OrderController { ordersEntity.setOrderNo(GenerateSequenceUtil.generateSequenceNo()); ordersEntity.setOrderStatus("0"); ordersEntity.setBasePoint(basePoint); + ordersEntity.setRemark(remark.substring(0,remark.length() - 1)); int result = orderService.generateOrder(ordersEntity, orderDatilListJson); if (result == 1) { System.out.println("orderService.generateOrder(ordersEntity, orderDatilListJson) == 1"); diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/model/OrdersEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/model/OrdersEntity.java index e569a25c..9cf2e14b 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/model/OrdersEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/model/OrdersEntity.java @@ -43,4 +43,6 @@ public class OrdersEntity { private Double basePoint = 0.0; + private String remark; + } From f713627e5da015fd1702fb67a73d5d411568f530 Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Mon, 21 Feb 2022 11:32:30 +0800 Subject: [PATCH 3/3] add remark value; --- .../module/system/royalcanin/good/model/OrderEntity.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/model/OrderEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/model/OrderEntity.java index 3dd21102..6d6e0d1e 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/model/OrderEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/model/OrderEntity.java @@ -42,4 +42,6 @@ public class OrderEntity { private String payType="1"; private String basePoint; + + private String remark; }