From 256c98cc6ebd7f04d55e19324c9d9f12ac8ed476 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期二, 30 七月 2024 23:26:04 +0800
Subject: [PATCH] 修改bug
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsListVO.java | 3
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java | 260 ++++++++++++++++++++++---------------------
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdMemberAuctionSalesroomVO.java | 3
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSkuListVO.java | 5
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsGroupPurchaseController.java | 42 ++++---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java | 5
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsGroupPurchaseInfo.java | 4
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 13 +
8 files changed, 184 insertions(+), 151 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsGroupPurchaseInfo.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsGroupPurchaseInfo.java
index 01fa962..6afda95 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsGroupPurchaseInfo.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/GoodsGroupPurchaseInfo.java
@@ -69,5 +69,9 @@
@TableLogic
private Integer delFlag;
+ @ApiModelProperty(value = "购买数量")
+ private Integer purchaseNum;
+
+
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsListVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsListVO.java
index 02ad0b2..a25ec88 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsListVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsListVO.java
@@ -13,6 +13,9 @@
@ApiModelProperty(value = "商品id")
private Long goodsSkuId;
+ @ApiModelProperty(value = "浏览目标id")
+ private Long targetId;
+
@ApiModelProperty(value = "商品名称")
private String goodsSkuName;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSkuListVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSkuListVO.java
index c88c935..8be25a1 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSkuListVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSkuListVO.java
@@ -1,6 +1,8 @@
package com.ruoyi.system.api.domain.vo;
+import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.core.enums.StartStatusEnum;
@@ -65,7 +67,8 @@
@ApiModelProperty(value = "商品id")
private Long goodsSkuId;
-
+ @ApiModelProperty(value = "创建时间")
+ private LocalDateTime createTime;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdMemberAuctionSalesroomVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdMemberAuctionSalesroomVO.java
index 66201d5..c49f148 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdMemberAuctionSalesroomVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdMemberAuctionSalesroomVO.java
@@ -20,6 +20,9 @@
@JsonInclude(JsonInclude.Include.ALWAYS)
private Long SalesroomId;
+ @ApiModelProperty(value = "浏览目标id")
+ private Long targetId;
+
@ApiModelProperty(value = "拍卖场名称")
@JsonInclude(JsonInclude.Include.ALWAYS)
private String salesroomName;
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsGroupPurchaseController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsGroupPurchaseController.java
index 66a4a80..f849338 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsGroupPurchaseController.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/inner/GoodsGroupPurchaseController.java
@@ -85,10 +85,9 @@
int i=one1.getCurrentNumber()-1;
if (i==0){
GoodsGroupPurchase byId = goodsGroupPurchaseService.getById(one1.getGroupPurchaseId());
- int i1 = byId.getLimitNumber() * byId.getGroupSize();
GoodsSku goodsSku = goodsSkuMapper.selectById(byId.getGoodsSkuId());
- int i2 = i1 + goodsSku.getStock();
+ int i2 = goodsGroupPurchaseInfo.getPurchaseNum() + goodsSku.getStock();
goodsSku.setStock(i2);
goodsSkuMapper.updateById(goodsSku);
goodsGroupPurchaseInfoServiceImpl.removeById(one1);
@@ -97,6 +96,19 @@
if (one1.getGroupSize()>one1.getCurrentNumber()){
one1.setGroupStatus(0);
}
+
+ Integer i3= one1.getPurchaseNum()-goodsGroupPurchaseInfo.getPurchaseNum();
+ one1.setPurchaseNum(i3);
+ goodsGroupPurchaseInfoServiceImpl.updateById(one1);
+
+ GoodsGroupPurchase byId = goodsGroupPurchaseService.getById(one1.getGroupPurchaseId());
+
+ GoodsSku goodsSku = goodsSkuMapper.selectById(byId.getGoodsSkuId());
+ int i2 = goodsGroupPurchaseInfo.getPurchaseNum() + goodsSku.getStock();
+ goodsSku.setStock(i2);
+ goodsSkuMapper.updateById(goodsSku);
+ goodsGroupPurchaseInfoServiceImpl.removeById(one1);
+
goodsGroupPurchaseInfoServiceImpl.updateById(one1);
}
@@ -110,20 +122,18 @@
GoodsGroupPurchaseInfo byId = goodsGroupPurchaseInfoServiceImpl.getById(goodsGroupPurchaseInfo.getId());
Integer num= byId.getCurrentNumber()+1;
byId.setCurrentNumber(num);
+ byId.setPurchaseNum(goodsGroupPurchaseInfo.getPurchaseNum());
+ goodsGroupPurchaseInfoServiceImpl.updateById(byId);
if (num==byId.getGroupSize()){
byId.setGroupStatus(1);
+ goodsGroupPurchaseInfoServiceImpl.updateById(byId);
orderClient.updateOrderStatusByMubres1(byId.getMubre(), SecurityConstants.INNER);
- List<Order> listR = orderClient.updateOrderStatusByMubres2(byId.getMubre(), SecurityConstants.INNER).getData();
- int i=0;
- for (Order l:listR){
- i=i+l.getGoodsQuantity();
- }
-
+ GoodsGroupPurchaseInfo byIds = goodsGroupPurchaseInfoServiceImpl.getById(goodsGroupPurchaseInfo.getId());
GoodsGroupPurchase byId1 = goodsGroupPurchaseService.getById(byId.getGroupPurchaseId());
int i1 = byId1.getLimitNumber() * byId.getGroupSize();
- if (i<i1){
- int i3=i1-i;
+ if (byIds.getPurchaseNum()<i1){
+ int i3=i1-byIds.getPurchaseNum();
GoodsSku goodsSku = goodsSkuMapper.selectById(byId1.getGoodsSkuId());
int i2 = i3 + goodsSku.getStock();
goodsSku.setStock(i2);
@@ -131,7 +141,7 @@
}
}
- goodsGroupPurchaseInfoServiceImpl.updateById(byId);
+
}else{
if (goodsGroupPurchaseInfo.getCurrentNumber()==goodsGroupPurchaseInfo.getGroupSize()){
goodsGroupPurchaseInfo.setGroupStatus(1);
@@ -139,16 +149,12 @@
}
goodsGroupPurchaseInfoServiceImpl.save(goodsGroupPurchaseInfo);
if (goodsGroupPurchaseInfo.getCurrentNumber()==goodsGroupPurchaseInfo.getGroupSize()) {
- List<Order> listR = orderClient.updateOrderStatusByMubres2(goodsGroupPurchaseInfo.getMubre(), SecurityConstants.INNER).getData();
- int i = 0;
- for (Order l : listR) {
- i = i + l.getGoodsQuantity();
- }
+
GoodsGroupPurchase byId1 = goodsGroupPurchaseService.getById(goodsGroupPurchaseInfo.getGroupPurchaseId());
int i1 = byId1.getLimitNumber() * goodsGroupPurchaseInfo.getGroupSize();
- if (i < i1) {
- int i3 = i1 - i;
+ if (goodsGroupPurchaseInfo.getPurchaseNum() < i1) {
+ int i3 = i1 - goodsGroupPurchaseInfo.getPurchaseNum();
GoodsSku goodsSku = goodsSkuMapper.selectById(byId1.getGoodsSkuId());
int i2 = i3 + goodsSku.getStock();
goodsSku.setStock(i2);
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java
index 3387e9f..48aae1e 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/inner/OrderController.java
@@ -239,6 +239,11 @@
@InnerAuth
@PostMapping("/updOrderStatusByMubres2")
R<List<Order>> updateOrderStatusByMubres2(@RequestBody String formedGroupMubres) {
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
orderService.updateOrderStatusByMubres2(formedGroupMubres);
return R.ok();
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index 1c2f696..8b6c194 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -982,6 +982,7 @@
goodsGroupPurchaseInfo.setMubre(order.getGroupNo());
GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo2(order.getGroupNo(), SecurityConstants.INNER).getData();
if (goodsSeckiGoodsGroupPurchaseInfo!=null){
+ goodsSeckiGoodsGroupPurchaseInfo.setPurchaseNum(order.getGoodsQuantity());
GoodsSkuClient.updgoodsGroupPurchaseInfo1(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);
}
@@ -1024,6 +1025,7 @@
goodsGroupPurchaseInfo.setMubre(order.getGroupNo());
GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo2(order.getGroupNo(), SecurityConstants.INNER).getData();
if (goodsSeckiGoodsGroupPurchaseInfo!=null){
+ goodsSeckiGoodsGroupPurchaseInfo.setPurchaseNum(order.getGoodsQuantity());
GoodsSkuClient.updgoodsGroupPurchaseInfo1(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);
}
@@ -1089,11 +1091,9 @@
Order byId = this.getById(memberOrderListDTO.getId());
if(byId.getOrderNo().contains("TG")){
- GoodsGroupPurchaseInfo goodsGroupPurchaseInfo =new GoodsGroupPurchaseInfo();
- goodsGroupPurchaseInfo.setGroupPurchaseId(byId.getGoodsSkuId());
- goodsGroupPurchaseInfo.setMubre(byId.getGroupNo());
- GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo1(goodsGroupPurchaseInfo, SecurityConstants.INNER).getData();
+ GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = GoodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo2(byId.getGroupNo(), SecurityConstants.INNER).getData();
if (goodsSeckiGoodsGroupPurchaseInfo!=null){
+ goodsSeckiGoodsGroupPurchaseInfo.setPurchaseNum(byId.getGoodsQuantity());
GoodsSkuClient.updgoodsGroupPurchaseInfo1(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);
}
@@ -1815,6 +1815,9 @@
@Override
public List<Order> updateOrderStatusByMubres2(String formedGroupMubres) {
- return this.lambdaQuery().eq(Order::getGroupNo, formedGroupMubres).list();
+ LambdaQueryWrapper<Order> wrapper = Wrappers.lambdaQuery();
+ wrapper.eq(Order::getGroupNo, formedGroupMubres);
+ List<Order> page1 = this.list(wrapper);
+ return page1;
}
}
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java
index 487f7b5..b646cee 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/PaylogServiceImpl.java
@@ -385,6 +385,8 @@
if (goodsSeckiGoodsGroupPurchaseInfo!=null){
page1.setGroupNo(goodsSeckiGoodsGroupPurchaseInfo.getMubre());
OrderMapper.updateById(page1);
+ Integer i= goodsSeckiGoodsGroupPurchaseInfo.getPurchaseNum()+page1.getGoodsQuantity();
+ goodsSeckiGoodsGroupPurchaseInfo.setPurchaseNum(i);
goodsSkuClient.updgoodsGroupPurchaseInfo(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);
}else{
@@ -394,6 +396,7 @@
GoodsGroupPurchaseInfo goodsGroupPurchaseInfo=new GoodsGroupPurchaseInfo();
goodsGroupPurchaseInfo.setGroupSize(goodsSeckiGoodsGroupPurchaseOne.getGroupSize());
goodsGroupPurchaseInfo.setCurrentNumber(1);
+ goodsGroupPurchaseInfo.setPurchaseNum(page1.getGoodsQuantity());
goodsGroupPurchaseInfo.setMubre(uuid.toString());
goodsGroupPurchaseInfo.setGroupPurchaseId(goodsSeckiGoodsGroupPurchaseOne.getId());
goodsGroupPurchaseInfo.setGroupStatus(0);
@@ -403,12 +406,12 @@
}
if (page1.getPoints()!=0){
- MemberPointsDTO memberPointsDTO=new MemberPointsDTO();
- memberPointsDTO.setMemberId(page1.getMemberId());
- memberPointsDTO.setPointsType(1);
- memberPointsDTO.setPointsStatus(PointStatusEnum.INCREASE);
- memberPointsDTO.setPoints(page1.getPoints());
- memberClient.addMemberPoints(memberPointsDTO);
+ MemberPointsDTO memberPointsDTO=new MemberPointsDTO();
+ memberPointsDTO.setMemberId(page1.getMemberId());
+ memberPointsDTO.setPointsType(1);
+ memberPointsDTO.setPointsStatus(PointStatusEnum.INCREASE);
+ memberPointsDTO.setPoints(page1.getPoints());
+ memberClient.addMemberPoints(memberPointsDTO);
}
updMembeOneDTO MembeOneDTO=new updMembeOneDTO();
MembeOneDTO.setType(1);
@@ -469,134 +472,137 @@
System.out.println("WxpayController.notify__notityXml：\n" + notityXml);
// 验证签名
- Map<String, Object> map = XMLParser.getMapFromXML(notityXml.toString());
- // log.debug("WxpayController.notify__map：\n" + map);
- // 接口返回状态
- String result_code = (String) map.get("result_code");
- if ("SUCCESS".equals(result_code)) {
- // // 商户订单号
- String out_trade_no = (String) map.get("out_trade_no");
- // // 微信支付交易号
- String trade_no = (String) map.get("transaction_id");
- // // 金额,以分为单位
- String total_fee = (String) map.get("total_fee");
- // // 优惠金额
- // String discount = (String) map.get("discount");
- // // 支付完成时间
- String time_end = (String) map.get("time_end");
- // // 支付者唯一Id（对应买家账号的一个加密串 ）
- String buyer_id = (String) map.get("buyer_id");
+ Map<String, Object> map = XMLParser.getMapFromXML(notityXml.toString());
+ // log.debug("WxpayController.notify__map：\n" + map);
+ // 接口返回状态
+ String result_code = (String) map.get("result_code");
+ if ("SUCCESS".equals(result_code)) {
+ // // 商户订单号
+ String out_trade_no = (String) map.get("out_trade_no");
+ // // 微信支付交易号
+ String trade_no = (String) map.get("transaction_id");
+ // // 金额,以分为单位
+ String total_fee = (String) map.get("total_fee");
+ // // 优惠金额
+ // String discount = (String) map.get("discount");
+ // // 支付完成时间
+ String time_end = (String) map.get("time_end");
+ // // 支付者唯一Id（对应买家账号的一个加密串 ）
+ String buyer_id = (String) map.get("buyer_id");
- ///////////////////////////// 这里程序处理支付回调逻辑
- ///////////////////////////// ////////////////////
+ ///////////////////////////// 这里程序处理支付回调逻辑
+ ///////////////////////////// ////////////////////
- LambdaQueryWrapper<Paylog> wrapper = Wrappers.lambdaQuery();
- wrapper.eq(Paylog::getOutTradeNo,out_trade_no);
- Paylog one = this.getOne(wrapper);
- if(SinataUtil.isEmpty(one)) {
- Paylog paylog = new Paylog();
- paylog.setOutTradeNo(out_trade_no);
- paylog.setPayType(2);
- paylog.setBuyerId(buyer_id);
- paylog.setTradeNo(trade_no);
- paylog.setPayMoney(Double.parseDouble(total_fee) / 100);
- paylog.setState(1);
- System.out.println("支付完成时间" + time_end);
- paylog.setAddTime(LocalDateTime.now());
- this.save(paylog);
- if (paylog.getOutTradeNo().contains("BO")) {
- LambdaQueryWrapper<OrderAuctionBond> wrapper1= Wrappers.lambdaQuery();
- wrapper1.eq(OrderAuctionBond::getOrderNo,paylog.getOutTradeNo());
- wrapper1.eq(OrderAuctionBond::getDelFlag,0);
- OrderAuctionBond one1 = orderAuctionBondMapper.selectOne(wrapper1);
- if (one1.getOrderTimeSx().isAfter(LocalDateTime.now())){
- String refundMoney = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100d);
- Integer refundFee = Integer.parseInt(refundMoney.substring(0, refundMoney.length() - 3));
- String money = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100d);
- Integer totalFee = Integer.parseInt(money.substring(0, money.length() - 3));
- refundFee = Integer.parseInt(money.substring(0, money.length() - 3));
+ LambdaQueryWrapper<Paylog> wrapper = Wrappers.lambdaQuery();
+ wrapper.eq(Paylog::getOutTradeNo,out_trade_no);
+ Paylog one = this.getOne(wrapper);
+ if(SinataUtil.isEmpty(one)) {
+ Paylog paylog = new Paylog();
+ paylog.setOutTradeNo(out_trade_no);
+ paylog.setPayType(2);
+ paylog.setBuyerId(buyer_id);
+ paylog.setTradeNo(trade_no);
+ paylog.setPayMoney(Double.parseDouble(total_fee) / 100);
+ paylog.setState(1);
+ System.out.println("支付完成时间" + time_end);
+ paylog.setAddTime(LocalDateTime.now());
+ this.save(paylog);
+ if (paylog.getOutTradeNo().contains("BO")) {
+ LambdaQueryWrapper<OrderAuctionBond> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.eq(OrderAuctionBond::getOrderNo,paylog.getOutTradeNo());
+ wrapper1.eq(OrderAuctionBond::getDelFlag,0);
+ OrderAuctionBond one1 = orderAuctionBondMapper.selectOne(wrapper1);
+ if (one1.getOrderTimeSx().isAfter(LocalDateTime.now())){
+ String refundMoney = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100d);
+ Integer refundFee = Integer.parseInt(refundMoney.substring(0, refundMoney.length() - 3));
+ String money = SinataUtil.doubleRetainTwo(paylog.getPayMoney() * 100d);
+ Integer totalFee = Integer.parseInt(money.substring(0, money.length() - 3));
+ refundFee = Integer.parseInt(money.substring(0, money.length() - 3));
- String regEx = "[^0-9]";
- Pattern p = Pattern.compile(regEx);
- Matcher m = p.matcher(paylog.getOutTradeNo());
- String ma = m.replaceAll("").trim();
- refundForWxpay(4, paylog.getTradeNo(), paylog.getOutTradeNo(), "R" + ma, totalFee, refundFee, "2");
+ String regEx = "[^0-9]";
+ Pattern p = Pattern.compile(regEx);
+ Matcher m = p.matcher(paylog.getOutTradeNo());
+ String ma = m.replaceAll("").trim();
+ refundForWxpay(4, paylog.getTradeNo(), paylog.getOutTradeNo(), "R" + ma, totalFee, refundFee, "2");
+ }
+
+ one1.setBoundStatus(BondStatusEnum.PAID);
+ one1.setPaymentMethod(PaymentMethodEnum.WECHAT);
+ orderAuctionBondMapper.updateById(one1);
+
+ }else{
+ LambdaQueryWrapper<Order> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.eq(Order::getOrderNo,paylog.getOutTradeNo());
+ wrapper1.eq(Order::getDelFlag,0);
+ Order page1 = OrderMapper.selectOne(wrapper1);
+ page1.setOrderStatus(OrderStatusEnum.TO_BE_SHIPPED);
+ page1.setPaymentMethod(PaymentMethodEnum.WECHAT);
+ page1.setPayTime(LocalDateTime.now());
+
+
+ if(page1.getOrderNo().contains("SP")){
+ GoodsSku goodsSku =new GoodsSku();
+ goodsSku.setId(page1.getGoodsSkuId());
+ goodsSku.setSoldQuantity(page1.getGoodsQuantity());
+ goodsSkuClient.updGoods(goodsSku, SecurityConstants.INNER);
+ }
+
+ if(page1.getOrderNo().contains("MS")){
+ GoodsSku goodsSku =new GoodsSku();
+ goodsSku.setId(page1.getGoodsSkuId());
+ goodsSku.setSoldQuantity(page1.getGoodsQuantity());
+ goodsSkuClient.updGoodsSeckill1(goodsSku, SecurityConstants.INNER);
+ }
+ if(page1.getOrderNo().contains("TG")){
+ GoodsGroupPurchase goodsSeckiGoodsGroupPurchaseOne = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(page1.getGoodsSkuId(), SecurityConstants.INNER).getData();
+ GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo(page1.getGoodsSkuId(), SecurityConstants.INNER).getData();
+ if (goodsSeckiGoodsGroupPurchaseInfo!=null){
+ page1.setGroupNo(goodsSeckiGoodsGroupPurchaseInfo.getMubre());
+ OrderMapper.updateById(page1);
+ Integer i= goodsSeckiGoodsGroupPurchaseInfo.getPurchaseNum()+page1.getGoodsQuantity();
+ goodsSeckiGoodsGroupPurchaseInfo.setPurchaseNum(i);
+ goodsSkuClient.updgoodsGroupPurchaseInfo(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);
+
+ }else{
+ UUID uuid = UUID.randomUUID();
+ page1.setGroupNo(uuid.toString());
+ OrderMapper.updateById(page1);
+ GoodsGroupPurchaseInfo goodsGroupPurchaseInfo=new GoodsGroupPurchaseInfo();
+ goodsGroupPurchaseInfo.setGroupSize(goodsSeckiGoodsGroupPurchaseOne.getGroupSize());
+ goodsGroupPurchaseInfo.setCurrentNumber(1);
+ goodsGroupPurchaseInfo.setPurchaseNum(page1.getGoodsQuantity());
+ goodsGroupPurchaseInfo.setMubre(uuid.toString());
+ goodsGroupPurchaseInfo.setGroupPurchaseId(goodsSeckiGoodsGroupPurchaseOne.getId());
+ goodsGroupPurchaseInfo.setGroupStatus(0);
+ goodsSkuClient.updgoodsGroupPurchaseInfo(goodsGroupPurchaseInfo, SecurityConstants.INNER);
+
}
-
- one1.setBoundStatus(BondStatusEnum.PAID);
- one1.setPaymentMethod(PaymentMethodEnum.WECHAT);
- orderAuctionBondMapper.updateById(one1);
-
- }else{
- LambdaQueryWrapper<Order> wrapper1= Wrappers.lambdaQuery();
- wrapper1.eq(Order::getOrderNo,paylog.getOutTradeNo());
- wrapper1.eq(Order::getDelFlag,0);
- Order page1 = OrderMapper.selectOne(wrapper1);
- page1.setOrderStatus(OrderStatusEnum.TO_BE_SHIPPED);
- page1.setPaymentMethod(PaymentMethodEnum.WECHAT);
- page1.setPayTime(LocalDateTime.now());
-
-
- if(page1.getOrderNo().contains("SP")){
- GoodsSku goodsSku =new GoodsSku();
- goodsSku.setId(page1.getGoodsSkuId());
- goodsSku.setSoldQuantity(page1.getGoodsQuantity());
- goodsSkuClient.updGoods(goodsSku, SecurityConstants.INNER);
- }
-
- if(page1.getOrderNo().contains("MS")){
- GoodsSku goodsSku =new GoodsSku();
- goodsSku.setId(page1.getGoodsSkuId());
- goodsSku.setSoldQuantity(page1.getGoodsQuantity());
- goodsSkuClient.updGoodsSeckill1(goodsSku, SecurityConstants.INNER);
- }
- if(page1.getOrderNo().contains("TG")){
- GoodsGroupPurchase goodsSeckiGoodsGroupPurchaseOne = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseOne(page1.getGoodsSkuId(), SecurityConstants.INNER).getData();
- GoodsGroupPurchaseInfo goodsSeckiGoodsGroupPurchaseInfo = goodsSkuClient.getGoodsSeckiGoodsGroupPurchaseInfo(page1.getGoodsSkuId(), SecurityConstants.INNER).getData();
- if (goodsSeckiGoodsGroupPurchaseInfo!=null){
- OrderMapper.updateById(page1);
- page1.setGroupNo(goodsSeckiGoodsGroupPurchaseInfo.getMubre());
- goodsSkuClient.updgoodsGroupPurchaseInfo(goodsSeckiGoodsGroupPurchaseInfo, SecurityConstants.INNER);
-
- }else{
- UUID uuid = UUID.randomUUID();
- page1.setGroupNo(uuid.toString());
- OrderMapper.updateById(page1);
- GoodsGroupPurchaseInfo goodsGroupPurchaseInfo=new GoodsGroupPurchaseInfo();
- goodsGroupPurchaseInfo.setGroupSize(goodsSeckiGoodsGroupPurchaseOne.getGroupSize());
- goodsGroupPurchaseInfo.setCurrentNumber(1);
- goodsGroupPurchaseInfo.setMubre(uuid.toString());
- goodsGroupPurchaseInfo.setGroupPurchaseId(goodsSeckiGoodsGroupPurchaseOne.getId());
- goodsGroupPurchaseInfo.setGroupStatus(0);
- goodsSkuClient.updgoodsGroupPurchaseInfo(goodsGroupPurchaseInfo, SecurityConstants.INNER);
-
- }
- }
- if (page1.getPoints()!=0){
+ }
+ if (page1.getPoints()!=0){
MemberPointsDTO memberPointsDTO=new MemberPointsDTO();
memberPointsDTO.setMemberId(page1.getMemberId());
memberPointsDTO.setPointsType(1);
memberPointsDTO.setPointsStatus(PointStatusEnum.INCREASE);
memberPointsDTO.setPoints(page1.getPoints());
memberClient.addMemberPoints(memberPointsDTO);
- }
- updMembeOneDTO MembeOneDTO=new updMembeOneDTO();
- MembeOneDTO.setType(1);
- MembeOneDTO.setMemberId(page1.getMemberId());
- MembeOneDTO.setMoney(page1.getTotalAmount());
- MembeOneDTO.setTotalPoints(page1.getPoints());
- memberClient.updMembeOne(MembeOneDTO, SecurityConstants.INNER);
}
-
- log.debug("WxpayController.notify__回调处理成功：SUCCESS");
- response.getOutputStream().print("success");
+ updMembeOneDTO MembeOneDTO=new updMembeOneDTO();
+ MembeOneDTO.setType(1);
+ MembeOneDTO.setMemberId(page1.getMemberId());
+ MembeOneDTO.setMoney(page1.getTotalAmount());
+ MembeOneDTO.setTotalPoints(page1.getPoints());
+ memberClient.updMembeOne(MembeOneDTO, SecurityConstants.INNER);
}
+
log.debug("WxpayController.notify__回调处理成功：SUCCESS");
response.getOutputStream().print("success");
- } else {
- log.debug("WxpayController.notify__回调处理：验证状态错误！" + result_code);
- System.out.println("验证状态错误！" + result_code);
}
+ log.debug("WxpayController.notify__回调处理成功：SUCCESS");
+ response.getOutputStream().print("success");
+ } else {
+ log.debug("WxpayController.notify__回调处理：验证状态错误！" + result_code);
+ System.out.println("验证状态错误！" + result_code);
+ }
} catch (Exception e) {
e.printStackTrace();
@@ -725,7 +731,7 @@
//设置请求参数(总金额)
String money=SinataUtil.doubleRetainTwo(price*100d);
- Integer price1 = Integer.parseInt(money.substring(0,money.length()-3));
+ Integer price1 = Integer.parseInt(money.substring(0,money.length()-3));
paraMap.put("total_fee", price1.toString());
//设置请求参数(通知地址)
paraMap.put("notify_url", Configure.wx_notify_url);
@@ -744,7 +750,7 @@
Map<String, String> map = PaymentKit.xmlToMap(xmlResult);
//返回状态码
String returnCode = map.get("return_code");
- /* Assert.isTrue("SUCCESS".equals(returnCode), getMsgByCode(returnCode));*/
+ /* Assert.isTrue("SUCCESS".equals(returnCode), getMsgByCode(returnCode));*/
//返回给小程序端需要的参数
Map<String, Object> returnMap = new HashMap<>(20);
@@ -893,11 +899,11 @@
return paylog;
}
- public boolean judgeContainsStr(String cardNum) {
- String regex=".*[a-zA-Z]+.*";
- Matcher m= Pattern.compile(regex).matcher(cardNum);
- return m.matches();
- }
+ public boolean judgeContainsStr(String cardNum) {
+ String regex=".*[a-zA-Z]+.*";
+ Matcher m= Pattern.compile(regex).matcher(cardNum);
+ return m.matches();
+ }
/**
* @param refundDTOS 退款数据传输对象
@@ -972,7 +978,7 @@
}
private Boolean handleRefund(Paylog paylog, BigDecimal amount,
- String orderNo) {
+ String orderNo) {
boolean res = false;
if (StringUtils.isNotNull(paylog)) {
if (paylog.getPayType() == 1) {
--
Gitblit v1.7.1