diff --git a/rc-busness/ajax/getData.js b/rc-busness/ajax/getData.js
index bbcb5a5e..319db10f 100644
--- a/rc-busness/ajax/getData.js
+++ b/rc-busness/ajax/getData.js
@@ -91,7 +91,6 @@ export const monitorOrderNotify = (OrderNumber) => {
* 删除购物车
*/
export const deleteCart = ( productCode) => {
- debugger;
var data = {
productCode
}
diff --git a/rc-busness/assets/css/global.less b/rc-busness/assets/css/global.less
index c9c0ff25..f34e1a19 100644
--- a/rc-busness/assets/css/global.less
+++ b/rc-busness/assets/css/global.less
@@ -328,7 +328,7 @@ picture {
height: auto;
position: fixed;
right: 0;
- top: 40%;
+ top: 56vh;
background: #FFFFFF;
box-shadow: 0 0 10px rgba(0, 0, 0, 0.16);
border-radius: .25rem;
diff --git a/rc-busness/assets/css/search.less b/rc-busness/assets/css/search.less
index bf719986..b9e060be 100644
--- a/rc-busness/assets/css/search.less
+++ b/rc-busness/assets/css/search.less
@@ -341,6 +341,7 @@ border-radius: 100px;
font-size: 18px;
color: #333333;
font-weight: bold;
+ margin-top:1rem;
}
.ts-scrollable{
margin-top: 1rem;
diff --git a/rc-busness/pages/personal/discount.vue b/rc-busness/pages/personal/discount.vue
index 9bd34dd9..fd34793b 100644
--- a/rc-busness/pages/personal/discount.vue
+++ b/rc-busness/pages/personal/discount.vue
@@ -34,7 +34,7 @@
￥
- {{item.couponTypeId=='4'?parseInt(((item.discount)*10))+'折':item.couponAmount}}
+ {{ item.couponAmount?item.couponAmount:(parseInt((item.discount)*10)+'折') }}
{{ item.couponName }}
diff --git a/rc-busness/pages/personal/settlement.less b/rc-busness/pages/personal/settlement.less
index fd3cbee5..2a8899e4 100644
--- a/rc-busness/pages/personal/settlement.less
+++ b/rc-busness/pages/personal/settlement.less
@@ -426,7 +426,7 @@ ul li ol li em strong i {
display: flex;
justify-content: flex-end;
flex-direction: column;
- align-items: self-end;
+ align-items: flex-end;
text-align: right;
i {
font-style: normal;
@@ -440,7 +440,7 @@ ul li ol li em strong i {
color: #e1001a;
font-size: 26px;
display:inline-block;
- width:5rem;
+ min-width:6rem;
}
.discountInfo {
diff --git a/rc-busness/pages/personal/settlement.vue b/rc-busness/pages/personal/settlement.vue
index 65f1923a..87d3e530 100644
--- a/rc-busness/pages/personal/settlement.vue
+++ b/rc-busness/pages/personal/settlement.vue
@@ -52,7 +52,7 @@
￥{{ item.productPrice }}
X{{ item.buyCount }}
-
￥{{ item.productPrice }}
+
￥{{ item.productPrice * item.buyCount }}
@@ -93,7 +93,7 @@
{{ discountAmount }}
合计金额:
- {{ discountedSumPrice }}
+ {{ finalAmount }}
提交订单
@@ -167,7 +167,7 @@
￥
- {{item.couponTypeId=='4'?parseInt(((item.discount)*10))+'折':item.couponAmount}}
+ {{ item.couponAmount?item.couponAmount:(parseInt((item.discount)*10)+'折') }}
{{ item.couponName }}
@@ -251,7 +251,9 @@ export default {
promotion: "￥167.00",
payment: "￥0.00 ",
},
- discountAmount:0
+ discountAmount:0,
+ finalAmount:0,
+ discountedProductCode:undefined,
};
},
computed: {
@@ -261,65 +263,101 @@ export default {
}, 0);
},
// 折扣计算
- discountedSumPrice() {
- let total = 0;
- if(this.curCoupon.couponId) {
- //Coupon Calculation
- let couponUsed=false;
- for(let itemInCart of this.goldmedal) {
- if((!this.curCoupon.productCodes || this.curCoupon.productCodes.indexOf(itemInCart.productCode)>-1) && !couponUsed) {
- if(this.curCoupon.minQuantity && this.curCoupon.minQuantity>itemInCart.buyCount) {
- //Check minQuantity
- total+=(itemInCart.buyCount * itemInCart.productPrice);
- } else if(this.curCoupon.minPrice && this.curCoupon.minPrice > (itemInCart.buyCount * itemInCart.productPrice)) {
- //Check minPrice
- total+=(itemInCart.buyCount * itemInCart.productPrice);
- } else {
- //Into coupon discount calculation
- switch(this.curCoupon.couponTypeId) {
- case 1: //Amount deduct
- total = total + (itemInCart.productPrice * itemInCart.buyCount - this.curCoupon.couponAmount);
- this.discountAmount = this.curCoupon.couponAmount;
- couponUsed=true;
- break;
- case 2: //Amount deduct with minPrice restriction
- case 6:
- total = total + (itemInCart.productPrice * itemInCart.buyCount) - this.curCoupon.couponAmount;
- this.discountAmount = this.curCoupon.couponAmount;
- couponUsed=true;
- break;
- case 3: //Limited product % discount
- case 4: //% discount
- total = total + (itemInCart.productPrice * itemInCart.buyCount) * this.curCoupon.discount;
- this.discountAmount = (itemInCart.productPrice * itemInCart.buyCount) * ( 1 - this.curCoupon.discount);
- couponUsed=true;
- break;
- default:
- total += itemInCart.productPrice * itemInCart.buyCount;
- break;
- }
- //Into coupon discount calculation end
- }
- } else {
- total += itemInCart.productPrice * itemInCart.buyCount;
- }
- }
- } else {
- //Normal Calculation
- total=this.goldmedal.reduce((pre, cur) => {
- return pre + cur.buyCount * cur.productPrice;
- }, 0);
- }
- if(this.discountAmount)
- this.discountAmount = this.discountAmount.toFixed(2);
- if(!total)
- total=0;
- total = total.toFixed(2);
- return total;
- },
},
methods: {
...mapMutations(["checkIsLogin"]),
+ discountedSumPrice() {
+ let total = 0;
+ if(this.curCoupon.productCodes)
+ this.finalAmount = this.qualifiedProductDiscount();
+ else
+ this.finalAmount = this.wholeOrderDiscount();
+ this.finalAmount = parseFloat(this.finalAmount).toFixed(2);
+ this.discountAmount = parseFloat(this.discountAmount).toFixed(2);
+ },
+ wholeOrderDiscount(){
+ this.discountedItemIndex = 0;
+ let checkResult = true;
+ if(this.curCoupon.minPrice && this.curCoupon.minPrice > this.sumPrice) {
+ checkResult = false;
+ }
+ if(this.curCoupon.couponAmount && this.curCoupon.couponAmount > this.sumPrice) {
+ checkResult = false;
+ }
+ if(checkResult) {
+ if(this.curCoupon.couponAmount && this.curCoupon.couponAmount>0) {
+ this.discountAmount = this.curCoupon.couponAmount;
+ return this.sumPrice - this.curCoupon.couponAmount;
+ } else if(this.curCoupon.discount && this.curCoupon.discount>0) {
+ this.discountAmount = this.sumPrice*this.curCoupon.discount;
+ return this.sumPrice * (1-this.curCoupon.discount);
+ }
+ } else {
+ return this.sumPrice;
+ }
+ },
+ qualifiedProductDiscount(){
+ this.discountedItemIndex = 0;
+ let total = 0;
+ let couponUsed = false;
+ let tmpShoppingCartList = this.arrSort(this.goldmedal);
+
+ for(let itemInCart of tmpShoppingCartList) {
+ if((!this.curCoupon.productCodes || this.curCoupon.productCodes.indexOf(itemInCart.productCode)>-1) && !couponUsed) {
+ if(this.curCoupon.minQuantity && this.curCoupon.minQuantity>itemInCart.buyCount) {
+ //Check minQuantity
+ total+=(itemInCart.buyCount * itemInCart.productPrice);
+ } else if(this.curCoupon.minPrice && this.curCoupon.minPrice > (itemInCart.buyCount * itemInCart.productPrice)) {
+ //Check minPrice
+ total+=(itemInCart.buyCount * itemInCart.productPrice);
+ } else {
+ //Into coupon discount calculation
+ switch(this.curCoupon.couponTypeId) {
+ case 1: //Amount deduct
+ total = total + (itemInCart.productPrice * itemInCart.buyCount - this.curCoupon.couponAmount);
+ this.discountAmount = this.curCoupon.couponAmount;
+ this.discountedProductCode = itemInCart.productCode;
+ couponUsed=true;
+ break;
+ case 2: //Amount deduct with minPrice restriction
+ case 6:
+ total = total + (itemInCart.productPrice * itemInCart.buyCount) - this.curCoupon.couponAmount;
+ this.discountAmount = this.curCoupon.couponAmount;
+ this.discountedProductCode = itemInCart.productCode;
+ couponUsed=true;
+ break;
+ case 3: //Limited product % discount
+ case 4: //% discount
+ total = total + (itemInCart.productPrice * itemInCart.buyCount) * this.curCoupon.discount;
+ this.discountAmount = (itemInCart.productPrice * itemInCart.buyCount) * ( 1 - this.curCoupon.discount);
+ this.discountedProductCode = itemInCart.productCode;
+ couponUsed=true;
+ break;
+ default:
+ total += itemInCart.productPrice * itemInCart.buyCount;
+ break;
+ }
+ //Into coupon discount calculation end
+ }
+ } else {
+ total += itemInCart.productPrice * itemInCart.buyCount;
+ }
+ }
+ return total;
+ },
+ arrSort(arr) {
+ let userarr=[]
+ let a=[];
+ for(let i in arr){
+ arr[i].total=arr[i].productPrice*arr[i].buyCount;
+ if(arr[i].total){
+ userarr.push(arr[i]);
+ }
+ }
+ return userarr.sort((n1,n2)=>{
+ return n2.total-n1.total;
+ });
+ },
async getAddressList() {
let memberId = JSON.parse(localStorage.getItem("userInfo")).data.id;
let { data } = await memberAddress("getAll", { memberId: memberId });
@@ -351,9 +389,11 @@ export default {
let valDateFromTime=0;
let valDateToTime=0;
let dateChecked=true;
+
if (data) {
this.drawlist=[];
for(let itemInCart of this.goldmedal) {
+ let tmpIndex=0;
for(let myCoupon of data.data) {
valDateFromTime=0;
valDateToTime=0;
@@ -370,9 +410,18 @@ export default {
if(valDateToTime && curTime > valDateToTime) {
dateChecked=false;
}
- if(dateChecked && myCoupon.status == 0 && (myCoupon.productCodes.indexOf(itemInCart.productCode)>-1 || !myCoupon.productCodes)) {
+ if(myCoupon.minQuantity && myCoupon.minQuantity>itemInCart.buyCount) {
+ dateChecked=false;
+ }
+ if(myCoupon.minPrice && myCoupon.minPrice>this.sumPrice) {
+ dateChecked=false;
+ }
+
+ if(dateChecked && myCoupon.activityId != 10 && myCoupon.status == 0 && (!myCoupon.productCodes || myCoupon.productCodes.indexOf(itemInCart.productCode)>-1)) {
+ data.data.splice(tmpIndex,1);
_self.drawlist.push(myCoupon);
}
+ tmpIndex++;
}
}
}
@@ -380,6 +429,7 @@ export default {
pickCoupon(item){
this.curCoupon = item;
this.dialogInfo1 = false;
+ this.discountedSumPrice();
},
editAddress(item) {
this.dialogAddTitle = "修改收货地址";
@@ -459,6 +509,7 @@ export default {
return;
}
let postData = [];
+ let tmpCounter=0;
this.goldmedal.forEach((item) => {
let basePoint = (item.basePoint?item.basePoint:0);
let oneProduct = {
@@ -483,7 +534,7 @@ export default {
addressDetailInfo: orderAddress[0].detailAddress,
},
};
- if(this.curCoupon.couponId) {
+ if(this.curCoupon.couponId && item.productCode == this.discountedProductCode) {
oneProduct.couponId = this.curCoupon.couponId;
oneProduct.couponTypeId = this.curCoupon.couponTypeId;
oneProduct.couponName = this.curCoupon.couponName;
@@ -491,6 +542,7 @@ export default {
oneProduct.couponAmount = (this.curCoupon.couponAmount?this.curCoupon.couponAmount:this.curCoupon.discount);
}
postData.push(oneProduct);
+ tmpCounter++;
});
// let postData = [
// {
@@ -570,6 +622,7 @@ export default {
this.goldmedal = JSON.parse(this.$route.query.list);
this.getAddressList();
this.checkIsLogin();
+ this.finalAmount = this.sumPrice;
// this.addressstype = this.$route.query.stype;
// this.orderNumber = this.$route.query.orderNumber;
// this.canceldanhao(this.orderNumber);
diff --git a/rc-busness/pages/personal/userpay.vue b/rc-busness/pages/personal/userpay.vue
index 156c1b67..b66fdc0e 100644
--- a/rc-busness/pages/personal/userpay.vue
+++ b/rc-busness/pages/personal/userpay.vue
@@ -64,7 +64,9 @@
您的商品我们正在抓紧打包，请耐心等候！
-
+
+
+
微信扫一扫，识别二维码
加入社群0元试用商品随单发放
商品编号：{{ curItem.brandCode }}{{ curItem.productCode }}
@@ -224,7 +224,7 @@
￥
- {{item.couponTypeId=='4'?parseInt(((item.discount)*10))+'折':item.couponAmount}}
+ {{ item.couponAmount?item.couponAmount:(parseInt((item.discount)*10)+'折') }}
{{ item.couponName }}
@@ -551,13 +551,13 @@ export default {
if(valDateToTime && curTime > valDateToTime) {
dateChecked=false;
}
- if(dateChecked) {
+ if(dateChecked && item.activityId!=10) {
if(!item.productCodes) {
menualist.push(item);
} else {
item.productCodes = item.productCodes.split(",");
item.productCodes.forEach((element) => {
- if (element == this.curItem.productCode && item.activityId !== 10) {
+ if (element == this.curItem.productCode) {
menualist.push(item);
}
});
@@ -593,6 +593,8 @@ export default {
// let userid=JSON.parse(location.getItem('userInfo'));
// let mobile=JSON.parse(location.getItem('userInfo'));
// console.log(userid,mobile);
+ let basePoint = item.basePoint;
+ basePoint = basePoint?basePoint:0;
let data = await postCourseId(
item.productCode,
this.sales_num,
@@ -603,7 +605,7 @@ export default {
item.ecPrice,
item.specifications,
item.leftAllotment,
- item.basePoint
+ basePoint
);
if (data) {
this.productlist = data;
@@ -655,7 +657,7 @@ export default {
this.dialogInfo2 = true;
return;
} else {
- this.userdraw(this.usermessage.data.mobile);
+ //this.userdraw(this.usermessage.data.mobile);
this.alldrawlist(this.usermessage.data.id);
this.dialogInfo1 = true;
}
diff --git a/rc-busness/pages/productdetails/productlist.vue b/rc-busness/pages/productdetails/productlist.vue
index 878b0a50..a2bad863 100644
--- a/rc-busness/pages/productdetails/productlist.vue
+++ b/rc-busness/pages/productdetails/productlist.vue
@@ -110,7 +110,7 @@
- {{ item.categoryName }}
+ {{ item.name }}
{{ item.ecPrice?("￥"+item.ecPrice):'' }}
{
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..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,10 +53,13 @@ public class OrderController {
@Autowired
private CartService cartService;
+ @Autowired
+ private CouponService couponService;
+
@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 = "";
@@ -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() ;
@@ -112,7 +125,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 +187,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));
@@ -252,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/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/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/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/java/net/lab1024/smartadmin/util/SmartJWTUtil.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartJWTUtil.java
index 66658737..de30c88a 100644
--- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartJWTUtil.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmartJWTUtil.java
@@ -15,7 +15,7 @@ public class SmartJWTUtil {
/**
* 过期时间一天
*/
- private static final int EXPIRE_SECONDS = 1 * 24 * 3600;
+ private static final int EXPIRE_SECONDS = 365 * 24 * 3600;
/**
* jwt加密字段
*/
@@ -78,7 +78,7 @@ public class SmartJWTUtil {
}
public static void main(String[] args) {
- String token = SmartJWTUtil.generateToken("884127");
+ String token = SmartJWTUtil.generateToken("884159");
System.out.println(token);
System.out.println(SmartJWTUtil.decodeToken(token));
}
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
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 00000000..516e6745
Binary files /dev/null and b/smart-admin-service/smart-admin-api/src/main/resources/wxpay/pro/apiclient_cert.p12 differ
diff --git a/smart-admin-service/smart-admin-api/src/main/resources/wxpay/pro/apiclient_cert.pem b/smart-admin-service/smart-admin-api/src/main/resources/wxpay/pro/apiclient_cert.pem
new file mode 100644
index 00000000..62675534
--- /dev/null
+++ b/smart-admin-service/smart-admin-api/src/main/resources/wxpay/pro/apiclient_cert.pem
@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIID6TCCAtGgAwIBAgIUMO4qJG/XR9oQeHQphVQ7usz5/0YwDQYJKoZIhvcNAQEL
+BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT
+FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg
+Q0EwHhcNMjIwMTI0MDgxMTA3WhcNMjcwMTIzMDgxMTA3WjB7MRMwEQYDVQQDDAox
+NTIzOTc3ODAxMRswGQYDVQQKDBLlvq7kv6HllYbmiLfns7vnu58xJzAlBgNVBAsM
+HuS4iua1t+aHi+avheWVhui0uOaciemZkOWFrOWPuDELMAkGA1UEBgwCQ04xETAP
+BgNVBAcMCFNoZW5aaGVuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+yRnwfm/9lHyq16cAJjx8/7x9WQF+/mKry6MvJIquaXUXBQKDO3d4deBLq8By7dXD
+xi7S7bPFeUkjXhgxs/WD15xyzNZj4qpKmXuEaFi0g1VLNUs3RmlWaR9OX0On+G2X
+vj4Zw1bi7sbefA1UrgNB7CH6nAaIVVWDdggxnUeX18F1y7BUBjPBh64Trbi0n011
+U/m738gyH37tfcSZCMM7aBO4/8BqRmRmNr58Owci8ee7G2yybGbRyVpT/3Y7cWLt
+k4pyOavIjpmaIo/CPbwMC5hOR4fxwyZUaTpyZh7foQFytz05UHvxp35hKZLnxI2d
+U+0wtymYYxTFGe6BngVHVwIDAQABo4GBMH8wCQYDVR0TBAIwADALBgNVHQ8EBAMC
+BPAwZQYDVR0fBF4wXDBaoFigVoZUaHR0cDovL2V2Y2EuaXRydXMuY29tLmNuL3B1
+YmxpYy9pdHJ1c2NybD9DQT0xQkQ0MjIwRTUwREJDMDRCMDZBRDM5NzU0OTg0NkMw
+MUMzRThFQkQyMA0GCSqGSIb3DQEBCwUAA4IBAQCOhr56rhhVqckEiN63f1JHD+SG
+4DRLCkcJ5oon2EvKOxCKFW9sqcggjtoF3R5ZQe8TwpGl/Pp7t0tbcpor9Gpr3V75
+fkkCsvotCaB3Hbpw/VzXP96848cQ8B/QtU+7oLCkCnakXeorgf/cLN/IlZ8ZAb5B
+R7ZEf8qthobPqAygrk1ZLmRNKzEMD+kWaFvffkYGeGP1chZPqevb4sS0BlckBaP/
+xeeU7R9Y5p5FANzIDCmHoFxqsrGLnF7Dh+bQSPSnG/rZjXnCYJFG6Jp/VvXP6enh
+5fpVimiUe/62aP6XkKLSm1sX9b86GuTaAl58n78oocNa/XBcKNJNa/3A37bW
+-----END CERTIFICATE-----
diff --git a/smart-admin-service/smart-admin-api/src/main/resources/wxpay/pro/apiclient_key.pem b/smart-admin-service/smart-admin-api/src/main/resources/wxpay/pro/apiclient_key.pem
new file mode 100644
index 00000000..134db0bf
--- /dev/null
+++ b/smart-admin-service/smart-admin-api/src/main/resources/wxpay/pro/apiclient_key.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDJGfB+b/2UfKrX
+pwAmPHz/vH1ZAX7+YqvLoy8kiq5pdRcFAoM7d3h14EurwHLt1cPGLtLts8V5SSNe
+GDGz9YPXnHLM1mPiqkqZe4RoWLSDVUs1SzdGaVZpH05fQ6f4bZe+PhnDVuLuxt58
+DVSuA0HsIfqcBohVVYN2CDGdR5fXwXXLsFQGM8GHrhOtuLSfTXVT+bvfyDIffu19
+xJkIwztoE7j/wGpGZGY2vnw7ByLx57sbbLJsZtHJWlP/djtxYu2TinI5q8iOmZoi
+j8I9vAwLmE5Hh/HDJlRpOnJmHt+hAXK3PTlQe/GnfmEpkufEjZ1T7TC3KZhjFMUZ
+7oGeBUdXAgMBAAECggEBAKmjzA+cgRjlIWjRY3rdw8QnSMXwUSReL/WULoxwwDgN
+oeGEARgE7ATjtHGp4klm7cMcdKo33/k0DTWuyx63mQQk4WKR56ipZkyauVMcoQm4
+xbyrOnGXImGDGyWZePRD3qGI2UrC3KP39m5HAIvaC54Z+8HqcM8rV74Vo2S9pAVH
+mhdH9VC5tnp2cBnOh8UyhIYmqAj/SXSk5Becq2IoYG8r5vojvohtxL/w5hbEfBnz
+VhjZo82t0hhFGHfFJHw/3D2JjGdYI8QTxTZ78pMb0uK5XsJtxdQFKf5jS4XopJ5k
+2h/YtAHxFv6K1cqyAaS3ZoyYGTOWy+eQrycGm62nNqECgYEA6UMsK8t/eS4NE1rK
+capEufddSDzUr2C34ZLxZgXXOpLEdbvvADlCVqqT0/N682xxeM0iK+HVHRpmbzE9
+v0MKPeMuRJ14aoiQEdGhDwEWgkyZr3GGdkgsIxO3/x9TNBK4F9pxZPFLSvkNDscO
+75A2CBtB18gm6yAHkr+UQRlpXpsCgYEA3LQ4Tfme2xD6sa0WE+SFGk4hW/wfMawi
+C1v5xJEjmI2ucKw3i19fKT+3a1LHY47ytjNS0hRQUoEYO0iEe1wO9t1TExmreLar
+mUW4jcnoLEUBBYHfu6vTbyoRePUXhtk9jb2cFEMpDXI3qNwGN+2LTRz3Q1G8T+D9
+kdHHGLF+h/UCgYB1GH5dAcvdBiwUMjh8NNBJVo7iS38tBu1n9H7wCzCPO8wZmh0R
+TK0rmneZJ5nqBt8zmC52PujfsjgHy31GvR2wEZJRaYdgW2uPNl+Wi6JECLYBp4ir
+afGWLjjofk4jTt5RQxw3YxW77igK6gxqYEdvbFdyPgyjbbG/jiKbR2lozwKBgQCU
+PwXW8oYO1e/eqsm6oPP7AGIN/GMjpWDUynoR2//R99ElY7iHiI9OELtufpLpv9ou
+InlOHVD6qjYRlBtRFTwD/BRSLxrroZ/P+3IE44ttOQh/n4Yd9EO4VsSXv+GGtaNP
+8v3E6nvHyWGzrd8LcCbyrDM2Z8+axCDu8r7OSmMYhQKBgQDa3hTeI/sV72kH+8vz
+GaTbQBtuxI34sKOxdsp7vR2IfTJjOPhTHgxCnISUaHFvgnYpmNgSZbLBMasIWouz
+9NbU+lEwGBXKcNbCKQaWut7z3CArsV5j/9kKQrBwXWVsFNgKYwO0Md7aEKtcruLN
+WjetT3R9CLwHFB2H+K3Mi0+5JA==
+-----END PRIVATE KEY-----