+
立即购买
@@ -342,6 +342,10 @@ export default {
let insertTmpObj = {id:1, attachmentType:1, sort:1, attachmentPath:newlist[0].picture};
productAttachmentList = [insertTmpObj];
userbuy = false;
+ console.log(curItem);
+ // debugger
+
+
console.log('这是处方量数据')
@@ -379,7 +383,7 @@ export default {
title: curItem.productName,
}
];
- console.log(curItem);
+
return {
crumbs,
activeIndexa,
@@ -401,6 +405,7 @@ export default {
videoimg:'',
videoshow: false,
name: [],
+ userloginbuy:false,
userlist: [],
drawlist: [], //用户可以领取的优惠券
alldraw: [],
@@ -469,7 +474,14 @@ export default {
mounted() {
this.checkIsLogin();
- // console.log(this.curItem);
+ console.log(this.curItem);
+ if(this.curItem.goodUrl.includes('pages')){
+ this.userloginbuy=false
+ console.log('------')
+ }else{
+ this.userloginbuy=true
+ console.log('-22222222');
+ }
if (this.usermessage !== "" || this.usermessage.data !== undefined) {
this.usermessage = this.$store.state.userInfo;
this.productCode = this.$route.query.productCode;
From d42c9546ec0836be995bd77fc42c8a4408799936 Mon Sep 17 00:00:00 2001
From: Carl <376654749@qq.com>
Date: Fri, 28 Jan 2022 15:47:23 +0800
Subject: [PATCH 3/6] add paymentAmount logic
---
.../smartadmin/module/system/wxpay/WxpayService.java | 6 +++++-
.../src/main/resources/prod/application.properties | 12 ++++++------
2 files changed, 11 insertions(+), 7 deletions(-)
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 6af36a4d..fb0334d8 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
@@ -15,6 +15,7 @@ import net.lab1024.smartadmin.module.system.wxpay.wxPayModel.WxPayEntity;
import net.lab1024.smartadmin.util.MapRemoveNullUtil;
import net.lab1024.smartadmin.util.SmartHttpUtil;
import net.lab1024.smartadmin.util.SmartIPUtil;
+import org.apache.poi.hpsf.Decimal;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -24,9 +25,11 @@ import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.math.BigDecimal;
import java.net.Inet4Address;
import java.net.InetAddress;
import java.net.URLEncoder;
+import java.text.DecimalFormat;
import java.util.*;
@Service
@@ -117,7 +120,8 @@ public class WxpayService {
// 更新订单状态
if ("SUCCESS".equals(sortedMap.get("result_code"))) {
String outTradeNo = sortedMap.get("out_trade_no"); // 流水号
- String totalFee = sortedMap.get("total_fee"); // 交易金额
+ DecimalFormat df = new DecimalFormat("0.00");
+ String totalFee = StringUtil.toString(df.format(df.format(Double.parseDouble(sortedMap.get("total_fee")) / 100))); // 交易金额
OrderEntity orderEntity = orderService.findByOrderId(outTradeNo);
String [] products = orderEntity.getProductCode().split(",");
ProductMasterQueryEntity productMasterQueryEntity = new ProductMasterQueryEntity();
diff --git a/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties b/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties
index 94f75be2..a135e225 100644
--- a/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties
+++ b/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties
@@ -1,10 +1,10 @@
######################### server ###################
-server.servlet.context-path=/smart-admin-api
-server.port=10088
+server.servlet.context-path=/royalcanin
+server.port=10086
spring.profiles.active=@profiles.active@
######################### tomcat ###################
-server.tomcat.basedir=/home/logs/smart-admin/tomcat-logs
+server.tomcat.basedir=/home/royalcanin-prod/tomcat-9/smart-admin/tomcat-logs
server.tomcat.accesslog.enabled=true
server.tomcat.accesslog.pattern=%t %{X-Forwarded-For}i %a "%r" %s %D (%D ms)
@@ -23,9 +23,9 @@ spring.servlet.multipart.max-request-size=30MB
file-upload-service.path=/home/upload/smart-admin-file
######################### database #########################
-spring.datasource.url=jdbc:mysql://172.16.0.201:3306/smart-admin-prod?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true
-spring.datasource.username=smart-admin
-spring.datasource.password=Admin@123457
+spring.datasource.url=jdbc:mysql://rc-hub-mysql.mysql.database.chinacloudapi.cn/smart-admin-prod?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true
+spring.datasource.username=azureuser@rc-hub-mysql
+spring.datasource.password=(G=q0D5ez2Fz
spring.datasource.initial-size=2
spring.datasource.min-idle=1
spring.datasource.max-active=100
From 505bf618ac6a196525e4f9d9b52e328716f9df30 Mon Sep 17 00:00:00 2001
From: Carl <376654749@qq.com>
Date: Fri, 28 Jan 2022 16:23:11 +0800
Subject: [PATCH 4/6] fix without basePoint and paytype
---
.../royalcanin/good/service/OrderService.java | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
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 7434a4fc..eafefa42 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
@@ -227,14 +227,19 @@ public class OrderService {
JSONObject jsonObject = JSONObject.parseObject(result);
String afterDecodeResult = AESUtil.decryptLinux(jsonObject.getString("data"), AESUtil.KEY);
com.alibaba.fastjson.JSONArray jsonArray = JSONObject.parseArray(afterDecodeResult);
- JSONObject jsonObjectResult = (JSONObject)jsonArray.get(0);
- if (queryEntity.getOrderNumber() != null &&queryEntity.getOrderNumber() != "") {
- OrderEntity orderEntity = ordersDao.findByOrderId(queryEntity.getOrderNumber());
- //新增支付方式paytype
- jsonObjectResult.put("paytype",orderEntity.getPayType());
- jsonObjectResult.put("basePoint",orderEntity.getBasePoint());
- }
+ for (int i = 0; i < jsonArray.size();i++){
+ JSONObject jsonObjectResult = (JSONObject)jsonArray.get(i);
+ OrderEntity orderEntity = ordersDao.findByOrderId(jsonObjectResult.getString("orderNumber"));
+ if (orderEntity == null){
+ jsonObjectResult.put("paytype","0");
+ jsonObjectResult.put("basePoint","0");
+ }else {
+ //新增支付方式paytype
+ jsonObjectResult.put("paytype",orderEntity.getPayType());
+ jsonObjectResult.put("basePoint",orderEntity.getBasePoint());
+ }
+ }
//记录服务响应时间
addOperatreFullData(url+"orderMaster/query",queryEntity.toString(),result, startTime,elapsedTime,acceptTime);
From 8baf7eb6787e25c164aaf05a811c8aff0838e10b Mon Sep 17 00:00:00 2001
From: "952108534@qq.com" <952108534@qq.com>
Date: Fri, 28 Jan 2022 18:19:40 +0800
Subject: [PATCH 5/6] =?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/productdetails/producted.vue | 546 ++++++++++--------
1 file changed, 292 insertions(+), 254 deletions(-)
diff --git a/rc-busness/pages/productdetails/producted.vue b/rc-busness/pages/productdetails/producted.vue
index c1957924..5f92ae55 100644
--- a/rc-busness/pages/productdetails/producted.vue
+++ b/rc-busness/pages/productdetails/producted.vue
@@ -15,11 +15,11 @@
rc-border-colour--brand4
"
>
-
-
-
+
+
+
-
- 适用年龄：
- {{ curItem.tagUsedAge }}
-
-
- 所属分类：
- {{ curItem.categoryName }}
-
-
-