From 4be3eb430ef3cf74c9d3fee908156b5be297bed4 Mon Sep 17 00:00:00 2001 From: "952108534@qq.com" <952108534@qq.com> Date: Mon, 24 Jan 2022 14:15:39 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rc-busness/pages/myorder/usertion.vue | 20 ++++++++-------- rc-busness/pages/personal/discount.vue | 2 +- rc-busness/pages/personal/useraddress.vue | 14 ++++++++---- rc-busness/static/js/date.js | 28 +++++++++++++++++++++++ 4 files changed, 50 insertions(+), 14 deletions(-) create mode 100644 rc-busness/static/js/date.js diff --git a/rc-busness/pages/myorder/usertion.vue b/rc-busness/pages/myorder/usertion.vue index 9fa62e32..bb03cd94 100644 --- a/rc-busness/pages/myorder/usertion.vue +++ b/rc-busness/pages/myorder/usertion.vue @@ -40,18 +40,18 @@
- +
{{ userlist.productName }}
- 规格:{{ item.productId }} + 规格:{{ userlist.specifications }}
- 数量:{{ item.pcs }}件 - ￥{{ 10 }} + 数量:{{ userlist.pcs }}件 + ￥{{ userlist.ecPrice }}
{{customer}}
@@ -96,7 +96,7 @@
  • 下单时间:: - {{ item.orderDate }} + {{ logisticsDate }}
  • 付款方式:: @@ -147,8 +147,12 @@ import Myheader from "~/components/header.vue"; import { mapMutations } from "vuex"; import { userin} from "../../ajax/getData"; - import MyFooter from '~/components/rc-footer.vue' + import MyFooter from '~/components/rc-footer.vue'; + import Vue from 'vue'; +let vm = new Vue(); + import formatConversion from '../../static/js/date' import {selectaddress,canceldanhao,generateOrderWX} from "../../ajax/getData"; + export default { data() { return { @@ -276,9 +280,7 @@ if(data){ else if(this.trackingstates==2){ this.trackingstates='未发货' } - console.log(this.goldmedal[i].orderDate); - this.logisticsDate=new Date(this.goldmedal[i].orderDate.toLocaleString())//时间戳 - console.log(this.logisticsDate); + this.logisticsDate=this.formatConversion(this.goldmedal[i].orderDate)//时间戳 this.logisticsCompany=this.goldmedal[i].orderDetailList[0].logisticsCompany; //物流公司 this.orderNumber=this.goldmedal[i].orderNumber this.usersalesAmount=this.goldmedal[i].salesAmount; diff --git a/rc-busness/pages/personal/discount.vue b/rc-busness/pages/personal/discount.vue index 32045c60..cbf93649 100644 --- a/rc-busness/pages/personal/discount.vue +++ b/rc-busness/pages/personal/discount.vue @@ -41,7 +41,7 @@
    • - {{ item.couponName }} + {{ item.couponDesc }}
    有效期 diff --git a/rc-busness/pages/personal/useraddress.vue b/rc-busness/pages/personal/useraddress.vue index c50c5415..dc9584a5 100644 --- a/rc-busness/pages/personal/useraddress.vue +++ b/rc-busness/pages/personal/useraddress.vue @@ -44,18 +44,18 @@
    - +
    - {{ item.usereat }} + {{ item.productName }}
    - 规格:{{ item.num }} + 规格:{{ item.specifications }}
    数量:{{ item.pcs }}件 - ￥10 + ￥{{item.ecPrice}}
    ￥{{ item.userprice }} @@ -322,6 +322,12 @@ export default { this.useralllist[i].addressUserName = this.goldmedal[i].addressUserName; this.useralllist[i].phoneNumber = this.goldmedal[i].phoneNumber; this.useralllist[i].salesAmount = this.goldmedal[i].salesAmount; + // this.useralllist[i].picFile = this.goldmedal[i].picFile; //图片路径 + // this.useralllist[i].productName=this.goldmedal[i].productName;//商品名称 + // this.useralllist[i].ecPrice=this.goldmedal[i].ecPrice//第一个的单价 + // this.useralllist[i].pcs=this.goldmedal[i].pcs//数量 + + this.useralllist[i].lengthnum=this.goldmedal[i].orderDetailList.length } console.log(this.obligation) diff --git a/rc-busness/static/js/date.js b/rc-busness/static/js/date.js new file mode 100644 index 00000000..5b05c6ac --- /dev/null +++ b/rc-busness/static/js/date.js @@ -0,0 +1,28 @@ + +//时间戳转化成格式时间 +import Vue from 'vue'; +Vue.prototype.formatConversion = function (te){ + if(te == ''){ + return ''; + }else if(te.length == 10){ + var time = new Date(te * 1000); //时间戳为10位需*1000，时间戳为13位的话不需乘1000 + var y = time.getFullYear(); + var m = time.getMonth() < 9 ? '0' + (time.getMonth() + 1) : time.getMonth() + 1; + var d = time.getDate() < 10 ? '0' + time.getDate() : time.getDate(); + var h = time.getHours() < 10 ? '0' + time.getHours() : time.getHours(); + var mm = time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes(); + var s = time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds(); + var timedate = y + '-' + m + '-' + d + ' ' + h + ':' + mm + ':' + s; + return timedate; + }else{ + var time = new Date(te); + var y = time.getFullYear(); + var m = time.getMonth() < 9 ? '0' + (time.getMonth() + 1) : time.getMonth() + 1; + var d = time.getDate() < 10 ? '0' + time.getDate() : time.getDate(); + var h = time.getHours() < 10 ? '0' + time.getHours() : time.getHours(); + var mm = time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes(); + var s = time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds(); + var timedate = y + '-' + m + '-' + d + ' ' + h + ':' + mm + ':' + s; + return timedate; + } +} \ No newline at end of file From adf7febb659c1f1ae9eda4d0cfc99c09d37e26ba Mon Sep 17 00:00:00 2001 From: "952108534@qq.com" <952108534@qq.com> Date: Mon, 24 Jan 2022 14:48:10 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rc-busness/assets/css/orderquantity.less | 4 ++-- rc-busness/pages/personal/useraddress.vue | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rc-busness/assets/css/orderquantity.less b/rc-busness/assets/css/orderquantity.less index 9b12653e..c92bd4a5 100644 --- a/rc-busness/assets/css/orderquantity.less +++ b/rc-busness/assets/css/orderquantity.less @@ -279,7 +279,7 @@ align-items: center; height: 164px; .rc-usercenter{ - width: 25%; + width: 27%; em{ font-size: 18px; } @@ -329,7 +329,7 @@ display: flex; justify-content: space-between; align-items: center; - width: 58%; + width: 56%; font-size: 20px; color: #E1001A; font-weight: bold; diff --git a/rc-busness/pages/personal/useraddress.vue b/rc-busness/pages/personal/useraddress.vue index dc9584a5..3d2c8771 100644 --- a/rc-busness/pages/personal/useraddress.vue +++ b/rc-busness/pages/personal/useraddress.vue @@ -58,9 +58,9 @@ ￥{{item.ecPrice}}
    - ￥{{ item.userprice }} - {{ item.orderstype }} - ￥{{ item.userprice }} + ￥{{ item.ecPrice }} + {{ item.pcs }} + ￥{{ item.salesAmount }}
    From dcf2ab195388f3292096bbd421f9ee7e923b7c9e Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Mon, 24 Jan 2022 16:41:26 +0800 Subject: [PATCH 3/8] adding install cart verification --- .../smartadmin/common/domain/ResponseDTO.java | 3 ++ .../royalcanin/good/OrderController.java | 8 +++-- .../royalcanin/good/model/OrdersEntity.java | 2 +- .../module/system/wxpay/MyConfig.java | 22 ++++++++------ .../module/system/wxpay/WxpayService.java | 1 + .../resources/wxpay/pro/apiclient_cert.p12 | Bin 0 -> 2710 bytes .../resources/wxpay/pro/apiclient_cert.pem | 23 ++++++++++++++ .../resources/wxpay/pro/apiclient_key.pem | 28 ++++++++++++++++++ 8 files changed, 74 insertions(+), 13 deletions(-) create mode 100644 smart-admin-service/smart-admin-api/src/main/resources/wxpay/pro/apiclient_cert.p12 create mode 100644 smart-admin-service/smart-admin-api/src/main/resources/wxpay/pro/apiclient_cert.pem create mode 100644 smart-admin-service/smart-admin-api/src/main/resources/wxpay/pro/apiclient_key.pem diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/ResponseDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/ResponseDTO.java index 92ec781e..4072e5d0 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/ResponseDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/ResponseDTO.java @@ -44,6 +44,7 @@ public class ResponseDTO { this.success = responseCodeConst.isSuccess(); } + private ResponseDTO(ResponseCodeConst responseCodeConst) { this.code = responseCodeConst.getCode(); this.msg = responseCodeConst.getMsg(); @@ -64,6 +65,8 @@ public class ResponseDTO { return new ResponseDTO(ResponseCodeConst.SUCCESS, data, msg); } + + public static ResponseDTO succData(T data) { return new ResponseDTO(ResponseCodeConst.SUCCESS, data); } 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 25731848..7b3b2e4b 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 @@ -54,7 +54,7 @@ public class OrderController { @ApiOperation(value = "微信支付订单", notes = "生成订单") @PostMapping("royalcanin/generateOrderWX") - public ResponseDTO generateOrderWX(@RequestBody List ordersEntityList) throws Exception { + public ResponseDTO> generateOrderWX(@RequestBody List ordersEntityList) throws Exception { StringBuffer productId = new StringBuffer(); StringBuffer productName = new StringBuffer(); String memberId = ""; @@ -112,7 +112,10 @@ public class OrderController { wxPayEntity.setProduct_id(ordersEntity.getProductCode()); wxPayEntity.setTotal_fee(StringUtil.toString(total_fee)); wxPayEntity.setOut_trade_no(ordersEntity.getOrderNo()); - return ResponseDTO.succData(ordersEntity.getOrderNo(),wxpayService.generateQRCode(wxPayEntity)); + Map returnMap = new HashMap<>(); + returnMap.put("orderNumber",ordersEntity.getOrderNo()); + returnMap.put("orderAmount",ordersEntity.getOrderAmount()); + return ResponseDTO.succData(returnMap,wxpayService.generateQRCode(wxPayEntity)); } return ResponseDTO.wrap(OrderResponseCodeConst.GENERATE_ORDER_FAIL); } @@ -171,7 +174,6 @@ public class OrderController { ordersEntity.setBuyCount(buyCount); ordersEntity.setOrderNo(GenerateSequenceUtil.generateSequenceNo()); ordersEntity.setOrderStatus("0"); - if(orderService.generateOrder(ordersEntity,orderDatilListJson) == 1){ wxPayEntity.setProduct_id(ordersEntity.getProductCode()); wxPayEntity.setTotal_fee(StringUtil.toString(total_fee)); 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 787d0641..e569a25c 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 @@ -41,6 +41,6 @@ public class OrdersEntity { private OrderAddress orderAddress; - private Double basePoint; + private Double basePoint = 0.0; } diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/MyConfig.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/MyConfig.java index 94d897f6..3f0bcb86 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/MyConfig.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/MyConfig.java @@ -11,8 +11,8 @@ import java.io.*; @Component public class MyConfig implements WXPayConfig { -// private String path ="C:/Users/Administrator/IdeaProjects/smart-admin/smart-admin-service/smart-admin-api/src/main/resources/wxpay/"; - private String path ="/home/royalcanin-dev/cert/"; +// private String path ="C:/Users/Administrator/IdeaProjects/smart-admin/smart-admin-service/smart-admin-api/src/main/resources/wxpay/pro/"; + private String path ="/home/royalcanin-dev/cert/pro/"; // public String notify_url = "http://47.96.75.242:10086/smart-admin-api/royalcanin/updateOrderWX"; @@ -34,18 +34,22 @@ public class MyConfig implements WXPayConfig { certStream.close(); } public String getAppID() { - return "wx3c51c14272f63a64"; + return "wxa9a0ae603bbe6ceb"; } - //wxa9a0ae603bbe6ceb + //wx3c51c14272f63a64 - public String getMchID() { - return "1315161001"; +// public String getMchID() { +// return "16717629989"; +// } + public String getMchID() { + return "1523977801"; } -// 16717629989 + //1315161001 + public String getKey() { - return "b69497999e8fd1f8f1f0a9591b24eb72"; + return "indexphpcorecertapicert201903200"; } - //indexphpcorecertapicert201903200 + //b69497999e8fd1f8f1f0a9591b24eb72 public InputStream getCertStream() { ByteArrayInputStream certBis = new ByteArrayInputStream(this.certData); diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayService.java index 8351a808..303d6bf2 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayService.java @@ -1,6 +1,7 @@ package net.lab1024.smartadmin.module.system.wxpay; import com.alibaba.fastjson.JSONObject; +import com.aliyun.oss.internal.SignUtils; import net.lab1024.smartadmin.common.heartbeat.StringUtil; import net.lab1024.smartadmin.module.system.royalcanin.MemberAccountService; import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrderEntity; diff --git a/smart-admin-service/smart-admin-api/src/main/resources/wxpay/pro/apiclient_cert.p12 b/smart-admin-service/smart-admin-api/src/main/resources/wxpay/pro/apiclient_cert.p12 new file mode 100644 index 0000000000000000000000000000000000000000..516e6745ce3aa34b693af615a7a1f40b927796c1 GIT binary patch literal 2710 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 Date: Mon, 24 Jan 2022 16:50:55 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BC=98=E6=83=A0=E5=88=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rc-busness/pages/myorder/usertion.vue | 37 ++++++++++------------- rc-busness/pages/personal/useraddress.vue | 2 +- rc-busness/pages/userlogin/edit.vue | 8 +++-- 3 files changed, 23 insertions(+), 24 deletions(-) diff --git a/rc-busness/pages/myorder/usertion.vue b/rc-busness/pages/myorder/usertion.vue index bb03cd94..ec033a2c 100644 --- a/rc-busness/pages/myorder/usertion.vue +++ b/rc-busness/pages/myorder/usertion.vue @@ -3,10 +3,11 @@
    -
    +
    {{item.status=='0'?'待付款':item.status=='1'?'待收货':item.status=='2'?'已完成':item.status=='3'?'已取消':'异常订单'}} {{orderstatus}}
    +
    {{ trackingstates}} @@ -19,23 +20,17 @@
    -
    - {{ datddress.recipient }} - {{ datddress.recipientPhone }} + {{ item.addressUserName }} + {{ item.addressPhoneNumber }}
    - {{ datddress.provinceName }}{{datddress.cityName}}{{datddress.districtName}}{{datddress.detailAddress}} + {{ item.addressProvinceName }}{{item.addressCityName}}{{item.addressCountyName}}
    - - -
    @@ -125,7 +120,7 @@ ￥{{usersalesAmount}}
    - 再次购买 + 再次购买
    @@ -159,6 +154,7 @@ export default { goldmedal:[], userproductId:'', logisticsDate:'', + addressPhoneNumber:'', userphone:'', logisticsNumber:'', customer:'',//联系客服或者取消订单 @@ -168,6 +164,7 @@ export default { logisticsCompany:'',//物流公司 orderstatus: '', goldastates:'', + userisdelivery:'待收货', userdelivery: "派送中", isshow:true, @@ -241,11 +238,11 @@ userpay(){ } }, //订单支付和再次购买 - onceagain(){ + onceagain(item){ console.log(this.payorsucess); if(this.payorsucess=='立即支付'){ console.log('----') - this.getwei(); + this.getwei(item); }else{ this.$router.push({ @@ -268,6 +265,7 @@ if(data){ console.log(this.goldmedal); for(let i=0;i { From 438f85e39828533d020a91c184958a6fb6d0c48a Mon Sep 17 00:00:00 2001 From: "952108534@qq.com" <952108534@qq.com> Date: Mon, 24 Jan 2022 17:26:32 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=8F=AA=E8=AE=A9=E4=BC=98=E6=83=A0?= =?UTF-8?q?=E5=88=B8=E6=9C=AA=E4=BD=BF=E7=94=A8=E5=87=BA=E7=8E=B0=E7=AB=8B?= =?UTF-8?q?=E5=8D=B3=E4=BD=BF=E7=94=A8=E7=9A=84=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rc-busness/pages/personal/discount.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rc-busness/pages/personal/discount.vue b/rc-busness/pages/personal/discount.vue index cbf93649..21bcba0d 100644 --- a/rc-busness/pages/personal/discount.vue +++ b/rc-busness/pages/personal/discount.vue @@ -48,7 +48,7 @@ {{item.validFrom}}至 {{item.validTo}}
    - +
    立即使用
    From 69c2664e21e96728882427f5e9b67fa1abb34da4 Mon Sep 17 00:00:00 2001 From: "952108534@qq.com" <952108534@qq.com> Date: Mon, 24 Jan 2022 17:41:52 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rc-busness/pages/myorder/usertion.vue | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/rc-busness/pages/myorder/usertion.vue b/rc-busness/pages/myorder/usertion.vue index ec033a2c..5a7e5d30 100644 --- a/rc-busness/pages/myorder/usertion.vue +++ b/rc-busness/pages/myorder/usertion.vue @@ -119,8 +119,8 @@ 合计金额: ￥{{usersalesAmount}}
    -
    - 再次购买 +
    + {{payorsucess}}
    @@ -284,7 +284,6 @@ if(data){ this.usersalesAmount=this.goldmedal[i].salesAmount; this.addressUserName=this.goldmedal[i].addressUserName; this.addressPhoneNumber=this.goldmedal[i].addressPhoneNumber; - } console.log(this.goldmedal,this.userproductId,this.usersalesAmount); } @@ -295,7 +294,7 @@ if(data){ async getwei(user) { console.log(user); let userPayData = { - + userprice: this.usersalesAmount, orderId:this.orderNumber, userinformation:this.addressUserName + From bae8ab44225b13fbbddb376740572f610d178165 Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Mon, 24 Jan 2022 18:24:58 +0800 Subject: [PATCH 7/8] modify coupon logic ,adding 3 verfiy --- .../royalcanin/good/OrderController.java | 23 +++++++++++++++---- .../system/royalcanin/good/dao/OrdersDao.java | 2 ++ .../royalcanin/good/service/OrderService.java | 4 ++-- .../system/royalcanin/Order/OrderMapper.xml | 6 +++++ 4 files changed, 28 insertions(+), 7 deletions(-) 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 7b3b2e4b..83d50853 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 @@ -12,6 +12,8 @@ import net.lab1024.smartadmin.constant.SwaggerTagConst; import net.lab1024.smartadmin.module.system.alipay.AliPayService; import net.lab1024.smartadmin.module.system.alipay.alipayModel.AliPayEntity; import net.lab1024.smartadmin.module.system.alipay.conf.AlipayConfig; +import net.lab1024.smartadmin.module.system.royalcanin.CouponService; +import net.lab1024.smartadmin.module.system.royalcanin.coupon.CouponGetAllEntity; import net.lab1024.smartadmin.module.system.royalcanin.good.constant.OrderResponseCodeConst; import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrderAddress; import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrderEntity; @@ -51,6 +53,9 @@ public class OrderController { @Autowired private CartService cartService; + @Autowired + private CouponService couponService; + @ApiOperation(value = "微信支付订单", notes = "生成订单") @PostMapping("royalcanin/generateOrderWX") @@ -76,10 +81,18 @@ public class OrderController { orderDatilListEntity.setEcPrice(ordersEntitys.getPayAmount()); orderDatilListJson.add(orderDatilListEntity); if(ordersEntitys.getCouponCode() != "" && ordersEntitys.getCouponCode() != null) { - ordersEntity.setCouponAmount(ordersEntitys.getCouponAmount()); - ordersEntity.setCouponCode(ordersEntitys.getCouponCode()); - ordersEntity.setCouponName(ordersEntitys.getCouponName()); - ordersEntity.setCouponId(ordersEntitys.getCouponId()); + CouponGetAllEntity couponGetAllEntity = new CouponGetAllEntity (); + couponGetAllEntity.setMemberId(ordersEntitys.getMemberId()); + couponGetAllEntity.setCouponCode(ordersEntitys.getCouponCode()); + String couponInfo = couponService.couponGetAll(couponGetAllEntity); + JSONObject jsonObject = JSONObject.parseObject(couponInfo); + com.alibaba.fastjson.JSONArray jsonArray = JSONObject.parseArray(jsonObject.getString("data")); + JSONObject jsonObjectData = (JSONObject)jsonArray.get(0); + + ordersEntity.setCouponAmount(jsonObjectData.getString("couponAmount") == null ?jsonObjectData.getString("discount"):jsonObjectData.getString("couponAmount")); + ordersEntity.setCouponCode(jsonObjectData.getString("couponCode")); + ordersEntity.setCouponName(jsonObjectData.getString("couponName")); + ordersEntity.setCouponId(jsonObjectData.getString("couponId")); total_fee = total_fee + orderService.couponTotal(ordersEntitys.getCouponTypeId(),Double.parseDouble(ordersEntitys.getCouponAmount()),Double.parseDouble(ordersEntitys.getPayAmount()),ordersEntitys.getBuyCount()); }else{ total_fee = total_fee + Double.parseDouble(ordersEntitys.getPayAmount()) * ordersEntitys.getBuyCount() ; @@ -254,7 +267,7 @@ public class OrderController { AliPayEntity aliPayEntity = new AliPayEntity(); ordersEntity.setPayType("2"); ordersEntity.setOrderStatus("0"); - if (orderService.updateOrder(ordersEntity) == 1) { + if (orderService.updateOrder(ordersEntity.getOrderNo()) == 1) { aliPayEntity.setProduct_code(ordersEntity.getProductCode()); aliPayEntity.setTotal_amount(ordersEntity.getOrderAmount()); aliPayEntity.setOut_trade_no(ordersEntity.getOrderNo()); diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/dao/OrdersDao.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/dao/OrdersDao.java index 3e94deff..680a6180 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/dao/OrdersDao.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/dao/OrdersDao.java @@ -22,4 +22,6 @@ public interface OrdersDao extends BaseMapper { Integer cancelOrder(String out_trade_no); + int updateByOrderNumber (@Param("orderNumber")String orderNumber); + } diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java index d30227cc..604d183e 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java @@ -281,7 +281,7 @@ public class OrderService { } - public int updateOrder(OrderEntity orderEntity){ - return ordersDao.updateById(orderEntity); + public int updateOrder(String orderNumber){ + return ordersDao.updateByOrderNumber(orderNumber); } } diff --git a/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/royalcanin/Order/OrderMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/royalcanin/Order/OrderMapper.xml index 7e1c1f13..d1e77563 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/royalcanin/Order/OrderMapper.xml +++ b/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/royalcanin/Order/OrderMapper.xml @@ -22,4 +22,10 @@ + + update t_good_orders + set pay_type ='2' + where order_no = #{orderNumber} + + \ No newline at end of file From a2a6ca14bd019102b47aada5a0d251a3b02a027c Mon Sep 17 00:00:00 2001 From: "952108534@qq.com" <952108534@qq.com> Date: Mon, 24 Jan 2022 19:29:33 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rc-busness/assets/css/global.less | 4 + rc-busness/assets/css/usertion.less | 234 +++++++----- rc-busness/pages/myorder/usertion.vue | 498 +++++++++++++------------- rc-busness/static/images/delivery.png | Bin 0 -> 4984 bytes 4 files changed, 415 insertions(+), 321 deletions(-) create mode 100644 rc-busness/static/images/delivery.png diff --git a/rc-busness/assets/css/global.less b/rc-busness/assets/css/global.less index f9ca05fc..cd1b7348 100644 --- a/rc-busness/assets/css/global.less +++ b/rc-busness/assets/css/global.less @@ -10,6 +10,7 @@ body { border:unset; } + .rc-menu--xs .rc-screen-reader{ left:28%; } @@ -141,6 +142,9 @@ picture { margin-left: auto; margin-right: auto; } +.useruantity{ + margin: 1rem 1.25rem; +} .ts-remove { text-decoration: line-through; diff --git a/rc-busness/assets/css/usertion.less b/rc-busness/assets/css/usertion.less index e337189e..3b51b56d 100644 --- a/rc-busness/assets/css/usertion.less +++ b/rc-busness/assets/css/usertion.less @@ -2,8 +2,110 @@ ul li ol li em strong i { list-style: none; font-style: normal; } + .rc-main{ + margin: 0; + padding: 0; + } //手机端 @media screen and (max-width: 768px) { + .online{ + margin: 0; + &.bold{ + height: 0.5rem; + } + } + // 订单状态 + .rc-receiving { + width: 100%; + display: flex; + align-items: center; + // margin: 1rem 1.25rem; + em { + font-style: normal; + color: #e1001a; + font-size: 1.375rem; + font-weight: bold; + } + span { + color: #666666; + font-size: 0.875rem; + display: block; + margin-left: 1.125rem; + width: 62%; + margin-top: 0.5rem; + + } + } + //快递列表 + .delivery { + display: flex; + flex-direction: column; + margin: 1rem 1.25rem; + .to-delivery { + img{ + width: 1rem; + height: 1rem; + object-fit: contain; + } + display: flex; + align-items: center; + font-style: normal; + span { + display: block; + margin-left: 0.18rem; + color: #333333; + font-size: 1rem; + font-weight: 500; + } + i { + font-style: normal; + margin-left: 0.5rem; + display: block; + color: #999999; + font-size: 0.75rem; + margin-top: 0.31rem; + } + } + .bo-delivery { + span { + font-size: 0.87rem; + color: #666666; + display: block; + margin-top: 0.5rem; + } + } + } + //地址列表 + .mypersonal{ + .my-delivery { + display: flex; + align-items: center; + font-style: normal; + span { + display: block; + font-size: 0.87rem; + color: #333333; + } + i { + font-style: normal; + display: block; + font-size: 0.87rem; + color: #333333; + margin-left: .5rem; + } + } + .per-delivery { + span { + font-size:0.875rem; + color: #666666; + display: block; + margin-top: 0.43rem; + } + } + } + + + .rc-margin-y--md{ width: 100%; height: 80px; @@ -39,83 +141,7 @@ margin-right: 20px; .rc-foo{ display: none; } - .rc-receiving { - width: 100%; - height: 80px; - display: flex; - align-items: center; - em { - font-style: normal; - color: #e1001a; - font-size: 22px; - font-weight: bold; - } - span { - color: #666666; - font-size: 12px; - display: block; - margin-left: 18px; - width: 62%; - - } - } - .delivery { - display: flex; - flex-direction: column; - height: 80px; - .to-delivery { - display: flex; - align-items: center; - font-style: normal; - span { - display: block; - margin-left: 3px; - } - i { - font-style: normal; - margin-left: 8px; - display: block; - } - } - .bo-delivery { - span { - font-size: 14px; - - color: #666666; - display: block; - margin-top: 8px; - } - } - } - - .mypersonal { - display: flex; - flex-direction: column; - height: 80px; - .my-delivery { - display: flex; - align-items: center; - font-style: normal; - span { - display: block; - margin-left: 3px; - } - i { - font-style: normal; - margin-left: 8px; - display: block; - } - } - .per-delivery { - span { - font-size: 14px; - - color: #666666; - display: block; - margin-top: 8px; - } - } - } + .rc-usermain { display: flex; @@ -207,14 +233,16 @@ margin-right: 20px; .rc-merchandise { width: 100%; - margin-top: 32px; + margin-top: 24px; + padding-right: 0.7rem; + padding-left: 0.7rem; ul { width: 100%; display: flex; flex-direction: column; justify-content: space-between; - line-height: 26px; + line-height: 30px; i { font-style: normal; color: #666666; @@ -240,10 +268,15 @@ margin-right: 20px; } } } + .useruantity{ + padding-right: 20px; + } } .rc-payment{ + padding-right: 0.7rem; + padding-left: 0.7rem; width: 100%; margin-top: 32px; .u-trackingnumber{ @@ -294,6 +327,48 @@ margin-right: 20px; //pc端 @media screen and (min-width: 768px) and (max-width: 1920px) { + + //快递列表 + .delivery { + display: flex; + flex-direction: column; + margin: 1rem 1.25rem; + .to-delivery { + margin-top: 20px; + img{ + width: 24px; + height: 24px; + object-fit: contain; + } + display: flex; + align-items: center; + font-style: normal; + span { + display: block; + margin-left: 16px; + color: #333333; + font-size: 18px; + font-weight: 500; + } + i { + font-style: normal; + margin-left: 0.5rem; + display: block; + color: #999999; + font-size: 0.75rem; + margin-top: 0.31rem; + } + } + .bo-delivery { + margin-top: 16px; + span { + font-size: 0.87rem; + color: #666666; + display: block; + margin-top: 16px; + } + } + } .rc-margin-y--md{ display: none; } @@ -329,7 +404,6 @@ margin-right: 20px; .delivery { display: flex; flex-direction: column; - height: 140px; display: flex; justify-content: center; .viewdetails{ diff --git a/rc-busness/pages/myorder/usertion.vue b/rc-busness/pages/myorder/usertion.vue index 5a7e5d30..e066f05e 100644 --- a/rc-busness/pages/myorder/usertion.vue +++ b/rc-busness/pages/myorder/usertion.vue @@ -2,40 +2,65 @@
    -
    -
    - {{item.status=='0'?'待付款':item.status=='1'?'待收货':item.status=='2'?'已完成':item.status=='3'?'已取消':'异常订单'}} - {{orderstatus}} +
    +
    +
    +
    + {{ + item.status == "0" + ? "待付款" + : item.status == "1" + ? "待收货" + : item.status == "2" + ? "已完成" + : item.status == "3" + ? "已取消" + : "异常订单" + }} + {{ orderstatus }} +
    +
    +
    +
    +
    + + {{ trackingstates }} +
    - -
    -
    - {{ trackingstates}} -
    -
    - {{ logisticsCompany }} -
    -
    - 查看详情 - -
    +
    + +
    -
    -
    - {{ item.addressUserName }} - {{ item.addressPhoneNumber }} -
    -
    - {{ item.addressProvinceName }}{{item.addressCityName}}{{item.addressCountyName}} -
    +
    + 查看详情 +
    -
    +
    +
    +
    +
    +
    + {{ item.addressUserName }} + {{ item.addressPhoneNumber }} +
    +
    + {{ item.addressProvinceName }}{{ item.addressCityName + }}{{ item.addressCountyName }} +
    +
    +
    +
    -
    +
    - +
    @@ -47,13 +72,13 @@
    数量:{{ userlist.pcs }}件 ￥{{ userlist.ecPrice }} -
    - {{customer}} -
    +
    + {{ customer }} +
    +
    +
    + {{ customer }}
    -
    - {{customer}} -
    +
    -
    +
    +
    • 商品总价: @@ -82,8 +109,10 @@
    +
    -
    +
    +
    • 订单编号:: @@ -104,271 +133,259 @@
    • 快递单号:
      - {{ logisticsNumber }} - - -
      + {{ logisticsNumber }} + +
    -
    -
    +
    合计金额: - ￥{{usersalesAmount}} -
    -
    - {{payorsucess}} -
    + ￥{{ usersalesAmount }} +
    +
    + {{ payorsucess }} +
    - -
    -
    - - {{payorsucess}} - +
    +
    +
    + + {{ payorsucess }} + +
    -
    - - +