From acccff9860b271d55c55dc87486f7c20b9896e6c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 13 一月 2025 16:19:54 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java |  866 +++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 676 insertions(+), 190 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
index 2a492c5..d96c6e6 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
@@ -19,12 +19,18 @@
 import com.ruoyi.order.model.OrderGood;
 import com.ruoyi.order.model.ShoppingCart;
 import com.ruoyi.order.service.*;
+import com.ruoyi.order.util.payment.PaymentUtil;
+import com.ruoyi.order.util.payment.model.CloseOrderResult;
+import com.ruoyi.order.util.payment.model.UniPayCallbackResult;
+import com.ruoyi.order.util.payment.model.UniPayResult;
 import com.ruoyi.order.vo.*;
 import com.ruoyi.other.api.domain.*;
 import com.ruoyi.other.api.feignClient.*;
 import com.ruoyi.other.api.vo.GetGoodsBargainPrice;
 import com.ruoyi.other.api.vo.GetGoodsShopByGoodsIds;
 import com.ruoyi.other.api.vo.GetSeckillActivityInfo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -32,9 +38,11 @@
 import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.util.*;
 import java.util.stream.Collectors;
 
+@Slf4j
 @Service
 public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, ShoppingCart> implements ShoppingCartService {
 
@@ -101,17 +109,16 @@
 	@Resource
 	private UserChangeLogClient userChangeLogClient;
 
-
-
-
-
-
-	
 	@Resource
 	private PointSettingClient pointSettingClient;
 	
 	@Resource
 	private OrderBalancePaymentService orderBalancePaymentService;
+	
+	@Resource
+	private RedisTemplate redisTemplate;
+	
+	
 	
 	
 	
@@ -135,7 +142,8 @@
 		}
 		List<Integer> goodsIds = data.stream().map(Goods::getId).collect(Collectors.toList());
 		//查询符合商品类型的商品数据
-		List<ShoppingCart> list = this.list(new LambdaQueryWrapper<ShoppingCart>().eq(ShoppingCart::getAppUserId, userid).in(ShoppingCart::getGoodsId, goodsIds));
+		List<ShoppingCart> list = this.list(new LambdaQueryWrapper<ShoppingCart>().eq(ShoppingCart::getAppUserId, userid)
+				.in(ShoppingCart::getGoodsId, goodsIds).eq(ShoppingCart::getStatus, 1));
 		//构建返回数据
 		List<MyShoppingCartVo> page = buildDetail(appUser, shopId, list, null);
 		return page;
@@ -149,7 +157,7 @@
 	 * @param shopId
 	 * @return
 	 */
-	public Price getPrice(AppUser appUser, Integer goodsId, Integer shopId){
+	public Price getPrice(AppUser appUser, Integer goodsId, Integer type, Integer shopId){
 		//获取支付价格
 		//秒杀活动>门店特价>地区价格>会员价格
 		//判断是否有秒杀活动
@@ -158,7 +166,8 @@
 		info.setGoodsId(goodsId);
 		info.setVip(appUser.getVipId());
 		GoodsSeckill goodsSeckill = seckillActivityInfoClient.getSeckillActivityInfo(info).getData();
-		if(null == goodsSeckill){
+		//没有秒杀活动或者添加的普通商品则不使用秒杀活动价格
+		if(null == goodsSeckill || type == 1){
 			//没有秒杀价,则判断门店特价
 			GetGoodsBargainPrice goodsBargainPrice = new GetGoodsBargainPrice();
 			goodsBargainPrice.setGoodsId(goodsId);
@@ -175,6 +184,7 @@
 				area.setCityCode(appUser.getCityCode());
 				area.setProvinceCode(appUser.getProvinceCode());
 				area.setVip(appUser.getVipId());
+				area.setGoodsId(goodsId);
 				GoodsArea goodsArea = goodsAreaClient.getGoodsArea(area).getData();
 				if(null == goodsArea){
 					//没有地区价格,则使用会员价格
@@ -191,6 +201,7 @@
 						price.setSuperiorSubcommission(goodsVip.getSuperiorSubcommission());
 						price.setSuperiorRebatePoints(goodsVip.getSuperiorRebatePoints());
 						price.setSuperiorType(goodsVip.getSuperiorType());
+						price.setSuperiorPriceType(goodsVip.getSuperiorPriceType());
 						price.setServuceShopCharges(goodsVip.getServuceShopCharges());
 						price.setServuceShopPoints(goodsVip.getServuceShopPoints());
 						price.setTechnicianPoints(goodsVip.getTechnicianPoints());
@@ -208,6 +219,7 @@
 					price.setSuperiorSubcommission(goodsArea.getSuperiorSubcommission());
 					price.setSuperiorRebatePoints(goodsArea.getSuperiorRebatePoints());
 					price.setSuperiorType(goodsArea.getSuperiorType());
+					price.setSuperiorPriceType(goodsArea.getSuperiorPriceType());
 					price.setServuceShopCharges(goodsArea.getServuceShopCharges());
 					price.setServuceShopPoints(goodsArea.getServuceShopPoints());
 					price.setTechnicianPoints(goodsArea.getTechnicianPoints());
@@ -228,17 +240,34 @@
 				area.setProvinceCode(appUser.getProvinceCode());
 				area.setVip(appUser.getVipId());
 				GoodsArea goodsArea = goodsAreaClient.getGoodsArea(area).getData();
-				price.setEarnSpendingPoints(goodsArea.getEarnSpendingPoints());
-				price.setSuperiorSubcommission(goodsArea.getSuperiorSubcommission());
-				price.setSuperiorRebatePoints(goodsArea.getSuperiorRebatePoints());
-				price.setSuperiorType(goodsArea.getSuperiorType());
-				price.setServuceShopCharges(goodsArea.getServuceShopCharges());
-				price.setServuceShopPoints(goodsArea.getServuceShopPoints());
-				price.setTechnicianPoints(goodsArea.getTechnicianPoints());
-				price.setBoundShopCharges(goodsArea.getBoundShopCharges());
-				price.setBoundShopPoints(goodsArea.getBoundShopPoints());
-				price.setBoundShopSuperiorsCharges(goodsArea.getBoundShopSuperiorsCharges());
-				price.setBoundShopSuperiorsPoints(goodsArea.getBoundShopSuperiorsPoints());
+				if(null != goodsArea){
+					price.setEarnSpendingPoints(goodsArea.getEarnSpendingPoints());
+					price.setSuperiorSubcommission(goodsArea.getSuperiorSubcommission());
+					price.setSuperiorRebatePoints(goodsArea.getSuperiorRebatePoints());
+					price.setSuperiorType(goodsArea.getSuperiorType());
+					price.setSuperiorPriceType(goodsArea.getSuperiorPriceType());
+					price.setServuceShopCharges(goodsArea.getServuceShopCharges());
+					price.setServuceShopPoints(goodsArea.getServuceShopPoints());
+					price.setTechnicianPoints(goodsArea.getTechnicianPoints());
+					price.setBoundShopCharges(goodsArea.getBoundShopCharges());
+					price.setBoundShopPoints(goodsArea.getBoundShopPoints());
+					price.setBoundShopSuperiorsCharges(goodsArea.getBoundShopSuperiorsCharges());
+					price.setBoundShopSuperiorsPoints(goodsArea.getBoundShopSuperiorsPoints());
+				}else{
+					GoodsVip goodsVip = goodsVipClient.getGoodsVip(goodsId, appUser.getVipId()).getData();
+					price.setEarnSpendingPoints(goodsVip.getEarnSpendingPoints());
+					price.setSuperiorSubcommission(goodsVip.getSuperiorSubcommission());
+					price.setSuperiorRebatePoints(goodsVip.getSuperiorRebatePoints());
+					price.setSuperiorType(goodsVip.getSuperiorType());
+					price.setSuperiorPriceType(goodsVip.getSuperiorPriceType());
+					price.setServuceShopCharges(goodsVip.getServuceShopCharges());
+					price.setServuceShopPoints(goodsVip.getServuceShopPoints());
+					price.setTechnicianPoints(goodsVip.getTechnicianPoints());
+					price.setBoundShopCharges(goodsVip.getBoundShopCharges());
+					price.setBoundShopPoints(goodsVip.getBoundShopPoints());
+					price.setBoundShopSuperiorsCharges(goodsVip.getBoundShopSuperiorsCharges());
+					price.setBoundShopSuperiorsPoints(goodsVip.getBoundShopSuperiorsPoints());
+				}
 			}
 		}else{
 			//构建价格数据
@@ -258,7 +287,8 @@
 			price.setEarnSpendingPoints(goodsSeckill.getEarnSpendingPoints());
 			price.setSuperiorSubcommission(goodsSeckill.getSuperiorSubcommission());
 			price.setSuperiorRebatePoints(goodsSeckill.getSuperiorRebatePoints());
-			price.setSuperiorType(String.valueOf(goodsSeckill.getSuperiorType()));
+			price.setSuperiorType(goodsSeckill.getSuperiorType());
+			price.setSuperiorPriceType(goodsSeckill.getSuperiorPriceType());
 			price.setServuceShopCharges(goodsSeckill.getServuceShopCharges());
 			price.setServuceShopPoints(goodsSeckill.getServuceShopPoints());
 			price.setTechnicianPoints(goodsSeckill.getTechnicianPoints());
@@ -276,9 +306,18 @@
 	@Override
 	public Long addGoods(ShoppingCart shoppingCart) {
 		Long userid = tokenService.getLoginUserApplet().getUserid();
-		shoppingCart.setAppUserId(userid);
-		this.save(shoppingCart);
-		return shoppingCart.getId();
+		ShoppingCart one = this.getOne(new LambdaQueryWrapper<ShoppingCart>().eq(ShoppingCart::getAppUserId, userid)
+				.eq(ShoppingCart::getGoodsId, shoppingCart.getGoodsId()).eq(ShoppingCart::getType, shoppingCart.getType()).eq(ShoppingCart::getStatus, 1));
+		if(null != one){
+			one.setNumber(one.getNumber() + shoppingCart.getNumber());
+			this.updateById(one);
+			return one.getId();
+		}else{
+			shoppingCart.setAppUserId(userid);
+			shoppingCart.setStatus(1);
+			this.save(shoppingCart);
+			return shoppingCart.getId();
+		}
 	}
 
 
@@ -324,12 +363,15 @@
 			JSONArray objects = JSON.parseArray(goodsJson);
 			Long id = objects.getJSONObject(0).getLong("id");
 			Integer num1 = objects.getJSONObject(0).getInteger("num");
+			Integer type = objects.getJSONObject(0).getInteger("type");
 			ShoppingCart shoppingCart = new ShoppingCart();
 			shoppingCart.setAppUserId(userid);
 			shoppingCart.setGoodsId(id.intValue());
 			shoppingCart.setNumber(num1);
-			Long shoppingCarId = addGoods(shoppingCart);
-			confirmOrder.setGoodsJson("[{\"id\": " + shoppingCarId + ", \"num\": " + num1 + "}]");
+			shoppingCart.setType(type);
+			shoppingCart.setStatus(0);
+			this.save(shoppingCart);
+			confirmOrder.setGoodsJson("[{\"id\": " + shoppingCart.getId() + ", \"num\": " + num1 + ",\"type\":" + type + "}]");
 		}
 		AppUser appUser = appUserClient.getAppUserById(userid);
 		Integer shopId = confirmOrder.getShopId();
@@ -350,33 +392,136 @@
 		confirmOrderVo.setShopName(shop.getName());
 		//现金支付
 		if(confirmOrder.getPaymentType() == 1){
-			BigDecimal bigDecimal = goodsList.stream().map(MyShoppingCartVo::getCash).reduce(BigDecimal::add).get();
+			BigDecimal bigDecimal = BigDecimal.ZERO;
+			for (MyShoppingCartVo myShoppingCartVo : goodsList) {
+				bigDecimal = bigDecimal.add(myShoppingCartVo.getCash().multiply(new BigDecimal(myShoppingCartVo.getNumber())));
+			}
 			confirmOrderVo.setOrderMoney(bigDecimal);
 		}else{
-			int sum = goodsList.stream().mapToInt(MyShoppingCartVo::getPoint).sum();
+			int sum = 0;
+			for (MyShoppingCartVo myShoppingCartVo : goodsList) {
+				sum += (myShoppingCartVo.getPoint() * myShoppingCartVo.getNumber());
+			}
 			confirmOrderVo.setOrderPoint(sum);
 		}
-		//查询当前是否有订单活动
-		OrderActivityInfo orderActivityInfo = orderActivityInfoClient.getNowOrderActivityInfo(appUser.getVipId()).getData();
+
 		BigDecimal orderMoney = confirmOrderVo.getOrderMoney();
 		BigDecimal paymentMoney = orderMoney;
-		//满XX才打折,只有现金才能优惠
-		if(null != orderActivityInfo && confirmOrder.getPaymentType() == 1 && orderActivityInfo.getConditionAmount().compareTo(orderMoney) <= 0){
-			confirmOrderVo.setActivityName(orderActivityInfo.getActivityName());
-			paymentMoney = orderActivityInfo.getDiscount().divide(new BigDecimal(10)).multiply(orderMoney);
-			confirmOrderVo.setDiscountAmount(orderMoney.subtract(paymentMoney).setScale(2, RoundingMode.HALF_EVEN));
-		}
+		//总优惠金额
+		BigDecimal activityAmount = BigDecimal.ZERO;
+
+
 		BaseSetting baseSetting = baseSettingClient.getBaseSetting(4).getData();
-		confirmOrderVo.setUseSimultaneously(baseSetting.getContent().equals("1"));
+		confirmOrderVo.setUseSimultaneously(JSON.parseObject(baseSetting.getContent()).getInteger("status") == 1);
+		//减去优惠券优惠金额
+		CouponInfoVo couponInfoVo = null;
+		if(null != confirmOrder.getCouponId() && 2 != confirmOrder.getPaymentType()){
+			couponInfoVo = userCouponClient.getCouponInfo(confirmOrder.getCouponId()).getData();
+			String forGoodIds = couponInfoVo.getForGoodIds();
+			String[] split = forGoodIds.split(",");
+			List<String> parseArray = Arrays.asList(split);
+			//全部商品
+			if("-1".equals(forGoodIds)){
+				//满减
+				if(1 == couponInfoVo.getCouponType() && couponInfoVo.getConditionAmount().compareTo(paymentMoney) <= 0){
+					paymentMoney = paymentMoney.subtract(couponInfoVo.getDiscountAmount());
+					activityAmount = activityAmount.add(couponInfoVo.getDiscountAmount());
+				}
+				//代金券
+				if(2 == couponInfoVo.getCouponType()){
+					paymentMoney = paymentMoney.subtract(couponInfoVo.getMoneyAmount());
+					activityAmount = activityAmount.add(couponInfoVo.getMoneyAmount());
+					if(paymentMoney.compareTo(BigDecimal.ZERO) < 0){
+						paymentMoney = BigDecimal.ZERO;
+					}
+				}
+				//折扣券
+				if(3 == couponInfoVo.getCouponType()){
+					BigDecimal paymentMoney1 = couponInfoVo.getDiscount().divide(new BigDecimal(10)).multiply(paymentMoney);
+					BigDecimal bigDecimal = paymentMoney.subtract(paymentMoney1).setScale(2, RoundingMode.HALF_EVEN);
+					paymentMoney = paymentMoney1;
+					activityAmount = activityAmount.add(bigDecimal);
+				}
+			}else{
+				//部分商品,需要计算参与优惠商品的支付金额,然后再对商品进行优惠券处理
+				paymentMoney = BigDecimal.ZERO;
+				BigDecimal goodsMoney = BigDecimal.ZERO;
+				for (MyShoppingCartVo myShoppingCartVo : goodsList) {
+					String goodsId = myShoppingCartVo.getGoodsId().toString();
+					BigDecimal cash = myShoppingCartVo.getCash();
+					if(parseArray.contains(goodsId)){
+						goodsMoney = goodsMoney.add(cash);
+					}else{
+						paymentMoney = paymentMoney.add(cash);
+					}
+				}
+
+				//满减
+				if(1 == couponInfoVo.getCouponType() && couponInfoVo.getConditionAmount().compareTo(goodsMoney) <= 0){
+					goodsMoney = goodsMoney.subtract(couponInfoVo.getDiscountAmount());
+					activityAmount = activityAmount.add(couponInfoVo.getDiscountAmount());
+				}
+				//代金券
+				if(2 == couponInfoVo.getCouponType()){
+					goodsMoney = goodsMoney.subtract(couponInfoVo.getMoneyAmount());
+					activityAmount = activityAmount.add(couponInfoVo.getMoneyAmount());
+					if(goodsMoney.compareTo(BigDecimal.ZERO) < 0){
+						goodsMoney = BigDecimal.ZERO;
+					}
+				}
+				//折扣券
+				if(3 == couponInfoVo.getCouponType()){
+					BigDecimal paymentMoney1 = couponInfoVo.getDiscount().divide(new BigDecimal(10)).multiply(goodsMoney);
+					BigDecimal bigDecimal = goodsMoney.subtract(paymentMoney1).setScale(2, RoundingMode.HALF_EVEN);
+					goodsMoney = paymentMoney1;
+					activityAmount = activityAmount.add(bigDecimal);
+				}
+				paymentMoney = paymentMoney.add(goodsMoney);
+			}
+		}
+
+		//查询当前是否有订单活动
+		List<OrderActivityInfo> orderActivityInfo = orderActivityInfoClient.getNowOrderActivityInfo(appUser.getVipId()).getData();
+		//满XX才打折,只有现金才能优惠
+		if((confirmOrderVo.getUseSimultaneously() || (!confirmOrderVo.getUseSimultaneously() && activityAmount.equals(BigDecimal.ZERO)))
+				&& null != orderActivityInfo && confirmOrder.getPaymentType() == 1){
+			BigDecimal zyh = BigDecimal.ZERO;
+			OrderActivityInfo activityInfo1 = null;
+			for (OrderActivityInfo activityInfo : orderActivityInfo) {
+				if(activityInfo.getConditionAmount().compareTo(paymentMoney) <= 0){
+					//优惠后的支付金额
+					BigDecimal multiply = activityInfo.getDiscount().divide(new BigDecimal(10)).multiply(paymentMoney);
+					//优惠金额
+					BigDecimal bigDecimal = paymentMoney.subtract(multiply).setScale(2, RoundingMode.HALF_EVEN);
+					if(bigDecimal.compareTo(zyh) > 0){
+						zyh = bigDecimal;
+						activityInfo1 = activityInfo;
+					}
+				}
+			}
+
+			if(null != activityInfo1){
+				confirmOrderVo.setActivityName(activityInfo1.getActivityName());
+				paymentMoney = paymentMoney.subtract(zyh);
+				activityAmount = activityAmount.add(zyh);
+			}
+		}
+		confirmOrderVo.setDiscountAmount(activityAmount);
 		int earnPoint = goodsList.stream().mapToInt(MyShoppingCartVo::getEarnSpendingPoints).sum();
 		confirmOrderVo.setEarnPoint(earnPoint);
+		if(BigDecimal.ZERO.compareTo(paymentMoney) > 0){
+			paymentMoney = BigDecimal.ZERO;
+		}
+
 		//支付金额,订单金额-订单优惠
 		confirmOrderVo.setPayMoney(paymentMoney);
-		confirmOrderVo.setResidualPoint(appUser.getLavePoint().intValue());
+		confirmOrderVo.setResidualPoint(appUser.getAvailablePoint().intValue());
 		//获取默认收货地址
 		UserAddress userAddress = userAddressClient.getDefaultUserAddress(userid).getData();
-		userAddress.setIdStr(userAddress.getId().toString());
-		confirmOrderVo.setUserAddress(userAddress);
+		if(null != userAddress){
+			userAddress.setIdStr(userAddress.getId().toString());
+			confirmOrderVo.setUserAddress(userAddress);
+		}
 		confirmOrderVo.setPaymentType(confirmOrder.getPaymentType());
 		//获取用户优惠券,用户全部优惠券,不能使用的需要标识出来置灰展示
 		PaymentUserCoupon paymentUserCoupon = new PaymentUserCoupon();
@@ -387,7 +532,7 @@
 			List<PaymentUserCouponVo> data = userCouponClient.getPaymentUserCoupon(paymentUserCoupon).getData();
 			if(null != data){
 				for (PaymentUserCouponVo couponInfo : data) {
-					List<Integer> forGoodIds = couponInfo.getForGoodIds();
+					List<String> forGoodIds = couponInfo.getForGoodIds();
 					//全部商品适用
 					if(null == forGoodIds){
 						//满减券
@@ -424,19 +569,19 @@
 		//获取快递策略
 		SystemConfig systemConfig = systemConfigClient.getSystemConfig(3).getData();
 		JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
-		confirmOrderVo.setExpressFee(jsonObject.getBigDecimal("expressFee"));
-		List<Integer> vip = jsonObject.getJSONArray("vip").toList(Integer.class);
+		confirmOrderVo.setExpressFee(jsonObject.getBigDecimal("freight"));
+		List<String> vip = Arrays.asList(jsonObject.getString("freeVip").split(","));
 		//包邮条件(所有会员或者满足条件的会员)
-		if(vip.get(0) == -1 || vip.contains(appUser.getVipId())){
+		if(vip.get(0).equals("0") || vip.contains(appUser.getVipId().toString())){
 			if(confirmOrder.getPaymentType() == 1){
 				//现金支付,支付金额满足包邮条件
-				BigDecimal cash = jsonObject.getBigDecimal("cash");
+				BigDecimal cash = jsonObject.getBigDecimal("freeFreight");
 				if(confirmOrderVo.getPayMoney().compareTo(cash) >= 0){
 					confirmOrderVo.setExpressFee(BigDecimal.ZERO);
 				}
 			}else{
 				//积分支付,支付积分是否满足包邮条件
-				Integer point = jsonObject.getInteger("point");
+				Integer point = jsonObject.getInteger("freeIntegral");
 				if(confirmOrderVo.getOrderPoint().compareTo(point) >= 0){
 					confirmOrderVo.setExpressFee(BigDecimal.ZERO);
 				}
@@ -460,6 +605,7 @@
 			Goods goods = goodsClient.getGoodsById(shoppingCart.getGoodsId()).getData();
 			MyShoppingCartVo vo = new MyShoppingCartVo();
 			vo.setId(shoppingCart.getId().toString());
+			vo.setType(shoppingCart.getType());
 			vo.setGoodsId(goods.getId());
 			vo.setHomePicture(goods.getHomePagePicture());
 			vo.setName(goods.getName());
@@ -474,7 +620,7 @@
 				}
 			}
 			//获取支付价格
-			Price price = getPrice(appUser, shoppingCart.getGoodsId(), shopId);
+			Price price = getPrice(appUser, shoppingCart.getGoodsId(), shoppingCart.getType(), shopId);
 			if(null == price){
 				price = new Price();
 				//使用商品的基础价格
@@ -498,6 +644,7 @@
 			//判断当前数量是否已经超出限购数量(需要计算已经购买的数量)
 			if(null == goods.getPurchaseLimit() || -1 == goods.getPurchaseLimit()){
 				vo.setPurchaseLimit(false);
+				vo.setPurchaseLimitNum(-1);
 			}else{
 				List<Order> orders = orderService.list(new LambdaQueryWrapper<Order>().eq(Order::getAppUserId, appUser.getId()).eq(Order::getDelFlag, 0).in(Order::getOrderStatus, Arrays.asList(4, 8)));
 				List<Long> orderIds = orders.stream().map(Order::getId).collect(Collectors.toList());
@@ -508,12 +655,14 @@
 					sum = orderGoodList.stream().mapToInt(OrderGood::getNum).sum();
 				}
 				vo.setPurchaseLimit((num + sum) > goods.getPurchaseLimit());
+				vo.setPurchaseLimitNum(goods.getPurchaseLimit() - sum);
 			}
 			vo.setDistributionMode(goods.getDistributionMode());
 			vo.setEarnSpendingPoints(price.getEarnSpendingPoints());
 			vo.setSuperiorSubcommission(price.getSuperiorSubcommission());
 			vo.setSuperiorRebatePoints(price.getSuperiorRebatePoints());
 			vo.setSuperiorType(price.getSuperiorType());
+			vo.setSuperiorPriceType(price.getSuperiorPriceType());
 			vo.setServuceShopCharges(price.getServuceShopCharges());
 			vo.setServuceShopPoints(price.getServuceShopPoints());
 			vo.setTechnicianPoints(price.getTechnicianPoints());
@@ -544,23 +693,36 @@
 		for (int i = 0; i < objects.size(); i++) {
 			Long id = objects.getJSONObject(i).getLong("id");
 			Integer num1 = objects.getJSONObject(i).getInteger("num");
+			Integer type = objects.getJSONObject(i).getInteger("type");
 			num += num1;
 			ShoppingCart shoppingCart = this.getById(id);
 			//判断当前数量是否已经超出限购数量(需要计算已经购买的数量)
+			Integer goodsSaleNum = orderService.getGoodsSaleNum(shoppingCart.getGoodsId(), type);
 			Goods goods = goodsClient.getGoodsById(shoppingCart.getGoodsId()).getData();
-			if(null != goods.getPurchaseLimit() && -1 != goods.getPurchaseLimit()){
-				List<Order> orders = orderService.list(new LambdaQueryWrapper<Order>().eq(Order::getAppUserId, appUser.getId()).eq(Order::getDelFlag, 0).in(Order::getOrderStatus, Arrays.asList(4, 8)));
-				List<Long> orderIds = orders.stream().map(Order::getId).collect(Collectors.toList());
-				int sum = 0;
-				if(orderIds.size() > 0){
-					List<OrderGood> orderGoodList = orderGoodService.list(new LambdaQueryWrapper<OrderGood>().in(OrderGood::getOrderId, orderIds)
-							.eq(OrderGood::getGoodsId, shoppingCart.getGoodsId()).eq(OrderGood::getDelFlag, 0));
-					sum = orderGoodList.stream().mapToInt(OrderGood::getNum).sum();
-				}
-				if((num1 + sum) > goods.getPurchaseLimit()){
+			if(1 == type){
+				if(null != goods.getPurchaseLimit() && -1 != goods.getPurchaseLimit() && (goodsSaleNum + num1) > goods.getPurchaseLimit()){
 					return R.fail(goods.getName() + "已超出购买上限");
 				}
+			}else{
+				GetSeckillActivityInfo info = new GetSeckillActivityInfo();
+				info.setGoodsId(shoppingCart.getGoodsId());
+				info.setVip(appUser.getVipId());
+				GoodsSeckill goodsSeckill = seckillActivityInfoClient.getSeckillActivityInfo(info).getData();
+				if(null != goodsSeckill ){
+					SeckillActivityInfo activityInfo = seckillActivityInfoClient.getSeckillActivityInfoById(goodsSeckill.getSeckillActivityInfoId()).getData();
+					if(null != activityInfo.getMaxNum() && -1 != activityInfo.getMaxNum() && (goodsSaleNum + num1) > activityInfo.getMaxNum()){
+						return R.fail(goods.getName() + "已超出秒杀活动购买上限");
+					}
+				}
 			}
+			
+			if(goods.getStatus() == 1){
+				throw new RuntimeException(goods.getName() + "商品已被下架");
+			}
+			if(!goods.getCommodityAuthority().contains("-1") && !goods.getCommodityAuthority().contains(appUser.getVipId().toString())){
+				throw new RuntimeException("无权限购买" + goods.getName());
+			}
+			
 			ids.add(id);
 		}
 
@@ -594,7 +756,7 @@
 			String goodsName = "";
 			for (Integer goodsId : goodsIds) {
 				Goods goods = goodsClient.getGoodsById(goodsId).getData();
-				if(1 == goods.getAppointStore() && !collect.contains(goodsId)){
+				if(goods.getType() == 1 && 1 == goods.getAppointStore() && !collect.contains(goodsId)){
 					goodsName = goods.getName();
 					break;
 				}
@@ -615,12 +777,8 @@
 				orderMoney = orderMoney.add(myShoppingCartVo.getCash().multiply(new BigDecimal(myShoppingCartVo.getNumber())));
 			}
 		}else{
-			orderPoint = goodsList.stream().mapToInt(MyShoppingCartVo::getPoint).sum();
 			for (MyShoppingCartVo myShoppingCartVo : goodsList) {
 				orderPoint += (myShoppingCartVo.getPoint() * myShoppingCartVo.getNumber());
-			}
-			if(appUser.getLavePoint().intValue() < orderPoint){
-				return R.fail("账户剩余积分不足");
 			}
 		}
 		//现金的支付金额
@@ -639,9 +797,10 @@
 		if(null != shoppingCartPayment.getUserCouponId() && 3 != shoppingCartPayment.getPaymentType()){
 			couponInfoVo = userCouponClient.getCouponInfo(shoppingCartPayment.getUserCouponId()).getData();
 			String forGoodIds = couponInfoVo.getForGoodIds();
-			List<Integer> parseArray = JSON.parseArray(forGoodIds, Integer.class);
+			String[] split = forGoodIds.split(",");
+			List<String> parseArray = Arrays.asList(split);
 			//全部商品
-			if(parseArray.contains(-1)){
+			if("-1".equals(forGoodIds)){
 				//满减
 				if(1 == couponInfoVo.getCouponType() && couponInfoVo.getConditionAmount().compareTo(paymentMoney) <= 0){
 					paymentMoney = paymentMoney.subtract(couponInfoVo.getDiscountAmount());
@@ -668,7 +827,7 @@
 				paymentMoney = BigDecimal.ZERO;
 				BigDecimal goodsMoney = BigDecimal.ZERO;
 				for (MyShoppingCartVo myShoppingCartVo : goodsList) {
-					Integer goodsId = myShoppingCartVo.getGoodsId();
+					String goodsId = myShoppingCartVo.getGoodsId().toString();
 					BigDecimal cash = myShoppingCartVo.getCash();
 					if(parseArray.contains(goodsId)){
 						goodsMoney = goodsMoney.add(cash);
@@ -703,29 +862,37 @@
 		}
 
 		//查询当前是否有订单活动
-		OrderActivityInfo orderActivityInfo = orderActivityInfoClient.getNowOrderActivityInfo(appUser.getVipId()).getData();
+		List<OrderActivityInfo> orderActivityInfo = orderActivityInfoClient.getNowOrderActivityInfo(appUser.getVipId()).getData();
 		BaseSetting baseSetting = baseSettingClient.getBaseSetting(4).getData();
 		//系统活动设置(优惠券和活动能否同时使用)
-		boolean useSimultaneously = baseSetting.getContent().equals("1");
+		Integer status = JSON.parseObject(baseSetting.getContent()).getInteger("status");
 		//满XX才打折,只有现金才能优惠
 		//如果使用优惠券,则需要判断是否可以和同时使用,且活动满足使用条件。
 		//没有使用优惠券,只需要判断是都满足使用条件
-		if((useSimultaneously || null == shoppingCartPayment.getUserCouponId()) &&
-				null != orderActivityInfo && shoppingCartPayment.getPaymentType() != 3 && orderActivityInfo.getConditionAmount().compareTo(paymentMoney) <= 0){
-			BigDecimal paymentMoney1 = orderActivityInfo.getDiscount().divide(new BigDecimal(10)).multiply(paymentMoney);
-			BigDecimal bigDecimal = paymentMoney.subtract(paymentMoney1).setScale(2, RoundingMode.HALF_EVEN);
-			discount = orderActivityInfo.getDiscount();
-			paymentMoney = paymentMoney1;
-			activityAmount = activityAmount.add(bigDecimal);
+		OrderActivityInfo orderActivityInfo1 = null;
+		if((1 == status || null == shoppingCartPayment.getUserCouponId()) &&
+				null != orderActivityInfo && shoppingCartPayment.getPaymentType() != 3){
+			//找出最优会的金额
+			BigDecimal zyh = BigDecimal.ZERO;
+			for (OrderActivityInfo activityInfo : orderActivityInfo) {
+				if(activityInfo.getConditionAmount().compareTo(paymentMoney) <= 0){
+					BigDecimal paymentMoney1 = activityInfo.getDiscount().divide(new BigDecimal(10)).multiply(paymentMoney);
+					BigDecimal bigDecimal = paymentMoney.subtract(paymentMoney1).setScale(2, RoundingMode.HALF_EVEN);
+					if(bigDecimal.compareTo(zyh) > 0){
+						zyh = bigDecimal;
+						orderActivityInfo1 = activityInfo;
+					}
+				}
+			}
+
+			paymentMoney = paymentMoney.subtract(zyh);
+			activityAmount = activityAmount.add(zyh);
 		}
 
 		//可获得的消费积分
 		int earnPoint = 0;
 		for (MyShoppingCartVo myShoppingCartVo : goodsList) {
 			earnPoint += (myShoppingCartVo.getEarnSpendingPoints() * myShoppingCartVo.getNumber());
-		}
-		if(null != shoppingCartPayment.getUserAddressId()){
-			userAddressClient.getUserAddressById(shoppingCartPayment.getUserAddressId()).getData();
 		}
 
 		//获取快递策略,计算快递费
@@ -734,25 +901,29 @@
 			SystemConfig systemConfig = systemConfigClient.getSystemConfig(3).getData();
 			JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
 			//快递费
-			expressFee = jsonObject.getBigDecimal("expressFee");
-			List<Integer> vip = jsonObject.getJSONArray("vip").toList(Integer.class);
+			expressFee = jsonObject.getBigDecimal("freight");
+			List<String> vip = Arrays.asList(jsonObject.getString("freeVip").split(","));
 			//包邮条件(所有会员或者满足条件的会员)
-			if(vip.get(0) == -1 || vip.contains(appUser.getVipId())){
+			if(vip.get(0).equals("0") || vip.contains(appUser.getVipId().toString())){
 				if(shoppingCartPayment.getPaymentType() != 3){
 					//现金支付,支付金额满足包邮条件
-					BigDecimal cash = jsonObject.getBigDecimal("cash");
+					BigDecimal cash = jsonObject.getBigDecimal("freeFreight");
 					if(paymentMoney.compareTo(cash) >= 0){
 						expressFee = BigDecimal.ZERO;
 					}
 				}else{
 					//积分支付,支付积分是否满足包邮条件
-					Integer point = jsonObject.getInteger("point");
+					Integer point = jsonObject.getInteger("freeIntegral");
 					if(orderPoint.compareTo(point) >= 0){
 						expressFee = BigDecimal.ZERO;
 					}
 				}
 			}
 		}
+		if(BigDecimal.ZERO.compareTo(paymentMoney) > 0){
+			paymentMoney = BigDecimal.ZERO;
+		}
+
 		//构建订单明细
 		Order order = new Order();
 		order.setAppUserId(userid);
@@ -784,9 +955,10 @@
 		}
 		if(3 != shoppingCartPayment.getPaymentType() && (fullReductionAmount.compareTo(BigDecimal.ZERO) > 0 ||moneyAmount.compareTo(BigDecimal.ZERO) > 0 || discountAmount.compareTo(BigDecimal.ZERO) > 0)){
 			order.setCouponJson(JSON.toJSONString(couponInfoVo));
+			order.setUserCouponId(shoppingCartPayment.getUserCouponId());
 		}
-		if(activityAmount.compareTo(BigDecimal.ZERO) > 0){
-			order.setActivityJson(JSON.toJSONString(orderActivityInfo));
+		if(null != orderActivityInfo1){
+			order.setActivityJson(JSON.toJSONString(orderActivityInfo1));
 		}
 		if(null != shoppingCartPayment.getUserAddressId()){
 			UserAddress address = userAddressClient.getUserAddressById(shoppingCartPayment.getUserAddressId()).getData();
@@ -806,6 +978,12 @@
 				return R.fail("账户余额不足");
 			}
 		}
+		if(3 == shoppingCartPayment.getPaymentType()){
+			Integer availablePoint = appUser.getAvailablePoint();
+			if(availablePoint < orderPoint){
+				return R.fail("账户可用积分不足");
+			}
+		}
 		//判断运费支付是否足够
 		if(null != shoppingCartPayment.getFreightPaymentType() && 2 == shoppingCartPayment.getFreightPaymentType() && expressFee.compareTo(BigDecimal.ZERO) > 0){
 			BigDecimal balance = appUser.getBalance();
@@ -820,19 +998,23 @@
 			OrderGood orderGood = new OrderGood();
 			orderGood.setGoodsId(myShoppingCartVo.getGoodsId());
 			orderGood.setOrderId(order.getId());
-			GetSeckillActivityInfo info = new GetSeckillActivityInfo();
-			info.setGoodsId(myShoppingCartVo.getGoodsId());
-			info.setVip(appUser.getVipId());
-			GoodsSeckill goodsSeckill = seckillActivityInfoClient.getSeckillActivityInfo(info).getData();
-			if(null != goodsSeckill){
-				orderGood.setSeckillJson(JSON.toJSONString(goodsSeckill));
-			}
 			for (int i = 0; i < objects.size(); i++) {
 				Long id = objects.getJSONObject(i).getLong("id");
 				if(myShoppingCartVo.getId().equals(id.toString())){
 					ShoppingCart shoppingCart = this.getById(id);
 					Integer num1 = objects.getJSONObject(i).getInteger("num");
+					Integer type = objects.getJSONObject(i).getInteger("type");
 					orderGood.setNum(num1);
+					orderGood.setType(type);
+					if(2 == type){
+						GetSeckillActivityInfo info = new GetSeckillActivityInfo();
+						info.setGoodsId(myShoppingCartVo.getGoodsId());
+						info.setVip(appUser.getVipId());
+						GoodsSeckill goodsSeckill = seckillActivityInfoClient.getSeckillActivityInfo(info).getData();
+						if(null != goodsSeckill){
+							orderGood.setSeckillJson(JSON.toJSONString(goodsSeckill));
+						}
+					}
 					Goods goods1 = goodsClient.getGoodsById(shoppingCart.getGoodsId()).getData();
 					orderGood.setGoodJson(JSON.toJSONString(goods1));
 					break;
@@ -844,6 +1026,7 @@
 			orderGood.setSuperiorSubcommission(myShoppingCartVo.getSuperiorSubcommission());
 			orderGood.setSuperiorRebatePoints(myShoppingCartVo.getSuperiorRebatePoints());
 			orderGood.setSuperiorType(myShoppingCartVo.getSuperiorType());
+			orderGood.setSuperiorPriceType(myShoppingCartVo.getSuperiorPriceType());
 			orderGood.setServuceShopCharges(myShoppingCartVo.getServuceShopCharges());
 			orderGood.setServuceShopPoints(myShoppingCartVo.getServuceShopPoints());
 			orderGood.setTechnicianPoints(myShoppingCartVo.getTechnicianPoints());
@@ -851,17 +1034,108 @@
 			orderGood.setBoundShopPoints(myShoppingCartVo.getBoundShopPoints());
 			orderGood.setBoundShopSuperiorsCharges(myShoppingCartVo.getBoundShopSuperiorsCharges());
 			orderGood.setBoundShopSuperiorsPoints(myShoppingCartVo.getBoundShopSuperiorsPoints());
+			orderGood.setCashPayment(myShoppingCartVo.getCashPayment() ? 1 : 0);
+			orderGood.setPointPayment(myShoppingCartVo.getPointPayment() ? 1 : 0);
+			orderGood.setSellingPrice(myShoppingCartVo.getCash());
+			orderGood.setIntegral(myShoppingCartVo.getPoint());
 			orderGoodService.save(orderGood);
 		}
 
 		//开始构建支付数据
 		//现金支付
 		paymentMoney = paymentMoney.add(expressFee).setScale(2, RoundingMode.HALF_EVEN);
+		if(BigDecimal.ZERO.compareTo(paymentMoney) > 0){
+			paymentMoney = BigDecimal.ZERO;
+		}
 		if(1 == shoppingCartPayment.getPaymentType()){
-			//调起微信支付 TODO 待完善
+			if(BigDecimal.ZERO.compareTo(paymentMoney) < 0){
+				//调起微信支付
+				String goodsNames = goodsList.stream().map(MyShoppingCartVo::getName).collect(Collectors.joining("\n"));
+				UniPayResult uniPayResult = PaymentUtil.uniPay(order.getOrderNumber(), paymentMoney.doubleValue(), order.getOrderType() == 1 ? "购买服务商品" : "购买单品商品",
+						goodsNames, "", "/order/shopping-cart/shoppingCartPaymentCallback", appUser.getWxOpenid(), null);
+				if(null == uniPayResult || !"100".equals(uniPayResult.getRa_Code())){
+					return R.fail(null == uniPayResult ? "支付失败" : uniPayResult.getRb_CodeMsg());
+				}
+				String rc_result = uniPayResult.getRc_Result();
+				JSONObject jsonObject = JSON.parseObject(rc_result);
+				jsonObject.put("orderId", order.getId().toString());
+				//将支付数据添加到redis队列中,便于定时任务去校验是否完成支付,没有完成支付支付,15分钟后关闭订单。
+				long second = LocalDateTime.now().plusMinutes(15).toEpochSecond(ZoneOffset.UTC);
+				redisTemplate.opsForZSet().add("OrderPayment", order.getOrderNumber(), second);
+				return R.ok(jsonObject.toJSONString());
+			}else{
 
+				earnPoint = order.getGetPoint();
+				appUser = appUserClient.getAppUserById(order.getAppUserId());
+				Integer lavePoint = appUser.getLavePoint();
+				paymentMoney = order.getPaymentAmount();
+				//构建积分流水记录
+				if(earnPoint > 0){
+					PointSetting pointSetting = pointSettingClient.getPointSetting(appUser.getVipId()).getData();
+					int earnPoint1 = 0;
+					if(null != pointSetting && 1 == pointSetting.getBuyPointOpen()){
+						earnPoint1 = new BigDecimal(earnPoint).multiply(pointSetting.getBuyPoint().divide(new BigDecimal(100))).intValue();
+					}
+					appUser.setShopPoint(appUser.getShopPoint() + earnPoint);
+					appUser.setLavePoint(appUser.getLavePoint() + earnPoint);
+					appUser.setTotalPoint(appUser.getTotalPoint() + earnPoint);
+					appUser.setAvailablePoint(appUser.getAvailablePoint() + earnPoint1);
+					appUser.setTotalAvailablePoint(appUser.getTotalAvailablePoint() + earnPoint1);
 
+					JSONObject jsonObject = new JSONObject();
+					jsonObject.put("shopPoint", earnPoint);
+					jsonObject.put("availablePoint", earnPoint1);
+					if(null != pointSetting && 1 == pointSetting.getBuyPointGift()){
+						appUser.setTransferablePoint(appUser.getTransferablePoint() + earnPoint1);
+						jsonObject.put("transferablePoint", earnPoint1);
+					}
 
+					UserPoint userPoint = new UserPoint();
+					userPoint.setType(1);
+					userPoint.setHistoricalPoint(lavePoint);
+					userPoint.setVariablePoint(earnPoint);
+					userPoint.setBalance(appUser.getLavePoint());
+					userPoint.setCreateTime(LocalDateTime.now());
+					userPoint.setAppUserId(appUser.getId());
+					userPoint.setObjectId(order.getId());
+					userPoint.setExtention(jsonObject.toJSONString());
+					userPointClient.saveUserPoint(userPoint);
+				}
+				appUser.setShopAmount(appUser.getShopAmount().add(paymentMoney).setScale(2, RoundingMode.HALF_EVEN));
+				appUser.setLastShopTime(LocalDateTime.now());
+				appUserClient.editAppUserById(appUser);
+				//变更等级
+				appUserClient.vipUpgrade(appUser.getId());
+				//修改订支付状态
+				order.setPayStatus(2);
+				//自提
+				if(order.getOrderType() == 1 && StringUtils.isEmpty(order.getAddressJson())){
+					order.setOrderStatus(2);
+				}
+				orderService.updateById(order);
+
+				//处理优惠券
+				if(null != order.getUserCouponId()){
+					UserCoupon userCoupon = userCouponClient.getUserCoupon(order.getUserCouponId()).getData();
+					if(null != userCoupon && null == userCoupon.getUseTime()){
+						userCoupon.setStatus(2);
+						userCoupon.setUseTime(LocalDateTime.now());
+						userCouponClient.editUserCoupon(userCoupon);
+					}
+				}
+				//添加查询快递信息队列
+				if(StringUtils.isNotEmpty(order.getExpressJson())){
+					//一小时后定时查询快递信息
+					redisTemplate.opsForZSet().add("order_express", order.getId(), LocalDateTime.now().plusHours(1).toEpochSecond(ZoneOffset.UTC));
+				}
+
+				//删除购物车数据
+				userid = tokenService.getLoginUserApplet().getUserid();
+				List<OrderGood> list1 = orderGoodService.list(new LambdaQueryWrapper<OrderGood>().eq(OrderGood::getOrderId, order.getId()));
+				List<Integer> goodsIds1 = list1.stream().map(OrderGood::getGoodsId).collect(Collectors.toList());
+				this.remove(new LambdaQueryWrapper<ShoppingCart>().eq(ShoppingCart::getAppUserId, userid).in(ShoppingCart::getGoodsId, goodsIds1));
+
+			}
 		}
 		//账户余额
 		BigDecimal redPacketAmount = BigDecimal.ZERO;
@@ -871,27 +1145,28 @@
 			BigDecimal totalDistributionAmount = appUser.getTotalDistributionAmount();
 			BigDecimal balance = appUser.getBalance();
 			//红包金额满足支付
-			if(paymentMoney.compareTo(totalRedPacketAmount) <= 0){
-				totalRedPacketAmount = totalRedPacketAmount.subtract(paymentMoney);
-				balance = balance.subtract(paymentMoney);
+			BigDecimal paymentMoney1 = paymentMoney;
+			if(paymentMoney1.compareTo(totalRedPacketAmount) <= 0){
+				totalRedPacketAmount = totalRedPacketAmount.subtract(paymentMoney1);
+				balance = balance.subtract(paymentMoney1);
 				appUser.setTotalRedPacketAmount(totalRedPacketAmount);
 				appUser.setBalance(balance);
-				redPacketAmount = paymentMoney;
+				redPacketAmount = paymentMoney1;
 			}else{
-				paymentMoney = paymentMoney.subtract(totalRedPacketAmount);
+				paymentMoney1 = paymentMoney1.subtract(totalRedPacketAmount);
 				redPacketAmount = totalRedPacketAmount;
 				totalRedPacketAmount = BigDecimal.ZERO;
-				if(paymentMoney.compareTo(totalDistributionAmount) <= 0){
-					totalDistributionAmount = totalDistributionAmount.subtract(paymentMoney);
-					balance = balance.subtract(paymentMoney);
+				if(paymentMoney1.compareTo(totalDistributionAmount) <= 0){
+					totalDistributionAmount = totalDistributionAmount.subtract(paymentMoney1);
+					balance = balance.subtract(paymentMoney1);
 					appUser.setTotalRedPacketAmount(totalRedPacketAmount);
 					appUser.setTotalDistributionAmount(totalDistributionAmount);
 					appUser.setBalance(balance);
-					distributionAmount = paymentMoney;
+					distributionAmount = paymentMoney1;
 				}else{
-					paymentMoney = paymentMoney.subtract(totalDistributionAmount);
+					paymentMoney1 = paymentMoney1.subtract(totalDistributionAmount);
 					totalDistributionAmount = BigDecimal.ZERO;
-					balance = balance.subtract(paymentMoney);
+					balance = balance.subtract(paymentMoney1);
 					appUser.setTotalRedPacketAmount(totalRedPacketAmount);
 					appUser.setTotalDistributionAmount(totalDistributionAmount);
 					appUser.setBalance(balance);
@@ -901,27 +1176,42 @@
 			//构建积分流水记录
 			if(earnPoint > 0){
 				PointSetting pointSetting = pointSettingClient.getPointSetting(appUser.getVipId()).getData();
-				int earnPoint1 = earnPoint;
+				int earnPoint1 = 0;
 				if(null != pointSetting && 1 == pointSetting.getBuyPointOpen()){
-					earnPoint1 = earnPoint1 * (100 - pointSetting.getBuyPoint());
+					earnPoint1 = new BigDecimal(earnPoint).multiply(pointSetting.getBuyPoint().divide(new BigDecimal(100))).intValue();
 				}
 				appUser.setShopPoint(appUser.getShopPoint() + earnPoint);
-				appUser.setLavePoint(appUser.getLavePoint() + earnPoint1);
+				appUser.setLavePoint(appUser.getLavePoint() + earnPoint);
 				appUser.setTotalPoint(appUser.getTotalPoint() + earnPoint);
+				appUser.setAvailablePoint(appUser.getAvailablePoint() + earnPoint1);
+				appUser.setTotalAvailablePoint(appUser.getTotalAvailablePoint() + earnPoint1);
 
-				UserPoint userPoint = new UserPoint();
-				userPoint.setType(1);
-				userPoint.setHistoricalPoint(appUser.getLavePoint() - earnPoint1);
-				userPoint.setVariablePoint(earnPoint);
-				userPoint.setBalance(appUser.getLavePoint());
-				userPoint.setCreateTime(LocalDateTime.now());
-				userPoint.setAppUserId(appUser.getId());
-				userPoint.setObjectId(order.getId());
-				userPointClient.saveUserPoint(userPoint);
+				JSONObject jsonObject = new JSONObject();
+				jsonObject.put("shopPoint", earnPoint);
+				jsonObject.put("availablePoint", earnPoint1);
+				if(null != pointSetting && 1 == pointSetting.getBuyPointGift()){
+					appUser.setTransferablePoint(appUser.getTransferablePoint() + earnPoint1);
+					jsonObject.put("transferablePoint", earnPoint1);
+				}
+
+				if(earnPoint > 0){
+					UserPoint userPoint = new UserPoint();
+					userPoint.setType(1);
+					userPoint.setHistoricalPoint(appUser.getLavePoint() - earnPoint);
+					userPoint.setVariablePoint(earnPoint);
+					userPoint.setBalance(appUser.getLavePoint());
+					userPoint.setCreateTime(LocalDateTime.now());
+					userPoint.setAppUserId(appUser.getId());
+					userPoint.setObjectId(order.getId());
+					userPoint.setExtention(jsonObject.toJSONString());
+					userPointClient.saveUserPoint(userPoint);
+				}
 			}
 			appUser.setShopAmount(appUser.getShopAmount().add(paymentMoney).setScale(2, RoundingMode.HALF_EVEN));
 			appUser.setLastShopTime(LocalDateTime.now());
 			appUserClient.editAppUserById(appUser);
+			//变更等级
+			appUserClient.vipUpgrade(appUser.getId());
 			//构建余额明细变动记录
 			BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord();
 			balanceChangeRecord.setAppUserId(appUser.getId());
@@ -941,68 +1231,102 @@
 			orderService.updateById(order);
 			//删除购物车数据
 			this.removeBatchByIds(ids);
-			//检查消费积分满足后升级会员
-			vipUpgrade(appUser);
+			//处理优惠券
+			if(null != order.getUserCouponId()){
+				UserCoupon userCoupon = userCouponClient.getUserCoupon(order.getUserCouponId()).getData();
+				if(null != userCoupon && null == userCoupon.getUseTime()){
+					userCoupon.setUseTime(LocalDateTime.now());
+					userCouponClient.editUserCoupon(userCoupon);
+				}
+			}
+			//添加查询快递信息队列
+			if(StringUtils.isNotEmpty(order.getExpressJson())){
+				//一小时后定时查询快递信息
+				redisTemplate.opsForZSet().add("order_express", order.getId(), LocalDateTime.now().plusHours(1).toEpochSecond(ZoneOffset.UTC));
+			}
 		}
 		//积分支付
 		if(3 == shoppingCartPayment.getPaymentType()){
-			Integer lavePoint = appUser.getLavePoint();
-			PointSetting pointSetting = pointSettingClient.getPointSetting(appUser.getVipId()).getData();
-			int earnPoint1 = earnPoint;
-			//计算可用积分比例
-			if(null != pointSetting && 1 == pointSetting.getBuyPointOpen()){
-				earnPoint1 = earnPoint1 * (100 - pointSetting.getBuyPoint());
+			//先完成快递费支付后再处理后续的逻辑
+			if(expressFee.compareTo(BigDecimal.ZERO) > 0){
+				if(shoppingCartPayment.getFreightPaymentType() == 1){
+					//调起微信支付
+					UniPayResult uniPayResult = PaymentUtil.uniPay("K" + order.getOrderNumber(), expressFee.doubleValue(), order.getOrderType() == 1 ? "购买服务商品快递费" : "购买单品商品快递费",
+							"快递费", "", "/order/shopping-cart/shoppingCartMaterialFlowPaymentCallback", appUser.getWxOpenid(), null);
+					if(null == uniPayResult || !"100".equals(uniPayResult.getRa_Code())){
+						return R.fail(null == uniPayResult ? "支付失败" : uniPayResult.getRb_CodeMsg());
+					}
+					String rc_result = uniPayResult.getRc_Result();
+					JSONObject jsonObject = JSON.parseObject(rc_result);
+					jsonObject.put("orderId", order.getId().toString());
+					//将支付数据添加到redis队列中,便于定时任务去校验是否完成支付,没有完成支付支付,15分钟后关闭订单。
+					long second = LocalDateTime.now().plusMinutes(15).toEpochSecond(ZoneOffset.UTC);
+					redisTemplate.opsForZSet().add("MaterialFlowPayment", "K" + order.getOrderNumber(), second);
+					return R.ok(jsonObject.toJSONString());
+				}
 			}
+
+			Integer lavePoint = appUser.getLavePoint();
+			//扣减订单支付积分
 			appUser.setLavePoint(appUser.getLavePoint() - orderPoint);
-			appUser.setShopPoint(appUser.getShopPoint() + earnPoint);
-			appUser.setLavePoint(appUser.getLavePoint() + earnPoint1);
-			appUser.setTotalPoint(appUser.getTotalPoint() + earnPoint);
-			appUser.setLastShopTime(LocalDateTime.now());
-			appUserClient.editAppUserById(appUser);
-			//检查消费积分满足后升级会员
-			vipUpgrade(appUser);
+			appUser.setAvailablePoint(appUser.getAvailablePoint() - orderPoint);
+			//可转增积分
+			Integer transferablePoint = appUser.getTransferablePoint();
+			Integer tra = 0;
+			if(transferablePoint > 0){
+				tra = transferablePoint - orderPoint;
+				appUser.setTransferablePoint(tra >= 0 ? tra : 0);
+			}else{
+				appUser.setTransferablePoint(appUser.getTransferablePoint() - orderPoint);
+			}
 
 			//构建积分流水记录
 			UserPoint userPoint = new UserPoint();
-			userPoint.setType(1);
+			userPoint.setType(11);
 			userPoint.setHistoricalPoint(lavePoint);
-			Integer point = appUser.getLavePoint() - lavePoint;
-			userPoint.setVariablePoint(point >= 0 ? point : point * -1);
+			userPoint.setVariablePoint(orderPoint);
 			userPoint.setBalance(appUser.getLavePoint());
 			userPoint.setCreateTime(LocalDateTime.now());
 			userPoint.setAppUserId(appUser.getId());
 			userPoint.setObjectId(order.getId());
+			userPoint.setExtention((tra >= 0 ? orderPoint : transferablePoint) + "");
 			userPointClient.saveUserPoint(userPoint);
+
+			appUser.setLastShopTime(LocalDateTime.now());
+			appUserClient.editAppUserById(appUser);
+			//变更等级
+			appUserClient.vipUpgrade(appUser.getId());
+
+			//积分支付不返佣
+
 			//如果有运费,需要先扣除账户积分,再进行支付。支付成功后修改订单状态,未支付成功则回退积分,删除的订单
 			if(expressFee.compareTo(BigDecimal.ZERO) > 0){
-				if(shoppingCartPayment.getFreightPaymentType() == 1){
-					//调起微信支付
-				}
 				if(shoppingCartPayment.getFreightPaymentType() == 2){
 					BigDecimal totalRedPacketAmount = appUser.getTotalRedPacketAmount();
 					BigDecimal totalDistributionAmount = appUser.getTotalDistributionAmount();
 					BigDecimal balance = appUser.getBalance();
-					if(expressFee.compareTo(totalRedPacketAmount) <= 0){
-						totalRedPacketAmount = totalRedPacketAmount.subtract(expressFee);
-						balance = balance.subtract(expressFee);
+					BigDecimal expressFee1 = expressFee;
+					if(expressFee1.compareTo(totalRedPacketAmount) <= 0){
+						totalRedPacketAmount = totalRedPacketAmount.subtract(expressFee1);
+						balance = balance.subtract(expressFee1);
 						appUser.setTotalRedPacketAmount(totalRedPacketAmount);
 						appUser.setBalance(balance);
-						redPacketAmount = expressFee;
+						redPacketAmount = expressFee1;
 					}else{
-						expressFee = expressFee.subtract(totalRedPacketAmount);
+						expressFee1 = expressFee1.subtract(totalRedPacketAmount);
 						redPacketAmount = totalRedPacketAmount;
 						totalRedPacketAmount = BigDecimal.ZERO;
-						if(expressFee.compareTo(totalDistributionAmount) <= 0){
-							totalDistributionAmount = totalDistributionAmount.subtract(expressFee);
-							balance = balance.subtract(expressFee);
+						if(expressFee1.compareTo(totalDistributionAmount) <= 0){
+							totalDistributionAmount = totalDistributionAmount.subtract(expressFee1);
+							balance = balance.subtract(expressFee1);
 							appUser.setTotalRedPacketAmount(totalRedPacketAmount);
 							appUser.setTotalDistributionAmount(totalDistributionAmount);
 							appUser.setBalance(balance);
-							distributionAmount = expressFee;
+							distributionAmount = expressFee1;
 						}else{
-							expressFee = expressFee.subtract(totalDistributionAmount);
+							expressFee1 = expressFee1.subtract(totalDistributionAmount);
 							totalDistributionAmount = BigDecimal.ZERO;
-							balance = balance.subtract(expressFee);
+							balance = balance.subtract(expressFee1);
 							appUser.setTotalRedPacketAmount(totalRedPacketAmount);
 							appUser.setTotalDistributionAmount(totalDistributionAmount);
 							appUser.setBalance(balance);
@@ -1016,8 +1340,8 @@
 					balanceChangeRecord.setAppUserId(appUser.getId());
 					balanceChangeRecord.setOrderId(order.getId());
 					balanceChangeRecord.setChangeType(5);
-					balanceChangeRecord.setBeforeAmount(balance.add(paymentMoney));
-					balanceChangeRecord.setChangeAmount(paymentMoney);
+					balanceChangeRecord.setBeforeAmount(balance.add(expressFee));
+					balanceChangeRecord.setChangeAmount(expressFee);
 					balanceChangeRecord.setAfterAmount(balance);
 					balanceChangeRecord.setDelFlag(0);
 					balanceChangeRecord.setCreateTime(LocalDateTime.now());
@@ -1041,7 +1365,16 @@
 				//删除购物车数据
 				this.removeBatchByIds(ids);
 			}
+			//添加查询快递信息队列
+			if(StringUtils.isNotEmpty(order.getExpressJson())){
+				//一小时后定时查询快递信息
+				SystemConfig systemConfig = systemConfigClient.getSystemConfig(3).getData();
+				JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
+				Integer waitTime = jsonObject.getInteger("waitTime");
+				redisTemplate.opsForZSet().add("order_express", order.getId(), LocalDateTime.now().plusHours(waitTime).toEpochSecond(ZoneOffset.UTC));
+			}
 		}
+
 		//添加账户余额支付明细
 		if(redPacketAmount.compareTo(BigDecimal.ZERO) > 0 || distributionAmount.compareTo(BigDecimal.ZERO) > 0){
 			OrderBalancePayment orderBalancePayment = new OrderBalancePayment();
@@ -1053,7 +1386,7 @@
 		return R.ok(order.getId().toString());
 	}
 
-
+	
 	public String getNumber(Integer size){
 		String str = "";
 		for (Integer i = 0; i < size; i++) {
@@ -1061,49 +1394,202 @@
 		}
 		return str;
 	}
-
-
+	
+	
 	/**
-	 * 会员等级变化
-	 * @param appUser
+	 * 线上支付回调逻辑处理
+	 * @param uniPayCallbackResult
+	 * @return
 	 */
-	public void vipUpgrade(AppUser appUser){
-		Integer shopPoint = appUser.getShopPoint();
-		Integer vipId = appUser.getVipId();
-		//钻石会员
-		VipSetting vipSetting3 = vipSettingClient.getVipSetting(3).getData();
-		Integer vipLevelUpShopRole = vipSetting3.getVipLevelUpShopRole();
-		Integer vipLevelUpShop = vipSetting3.getVipLevelUpShop();
-		if(null != vipLevelUpShopRole && 1 == vipLevelUpShopRole && appUser.getVipId() < 3 && shopPoint >= vipLevelUpShop){
-			appUser.setVipId(3);
-			appUserClient.editAppUserById(appUser);
-			//添加等级变化记录
-			UserChangeLog userChangeLog = new UserChangeLog();
-			userChangeLog.setDelFlag(0);
-			userChangeLog.setCreateTime(LocalDateTime.now());
-			userChangeLog.setAppUserId(appUser.getId());
-			userChangeLog.setBeforeVipId(vipId);
-			userChangeLog.setAfterVipId(appUser.getVipId());
-			userChangeLog.setChangeType(1);
-			userChangeLogClient.saveUserChangeLog(userChangeLog);
-			return;
+	@Override
+	public R shoppingCartPaymentCallback(UniPayCallbackResult uniPayCallbackResult) {
+		Order order = orderService.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderNumber, uniPayCallbackResult.getR2_OrderNo()));
+		if(null == order || order.getPayStatus() == 2){
+			return R.ok();
 		}
-		//黄金会员
-		VipSetting vipSetting2 = vipSettingClient.getVipSetting(2).getData();
-		vipLevelUpShopRole = vipSetting2.getVipLevelUpShopRole();
-		vipLevelUpShop = vipSetting2.getVipLevelUpShop();
-		if(null != vipLevelUpShopRole && 1 == vipLevelUpShopRole && appUser.getVipId() < 2 && shopPoint >= vipLevelUpShop){
-			appUser.setVipId(2);
-			appUserClient.editAppUserById(appUser);
-			//添加等级变化记录
-			UserChangeLog userChangeLog = new UserChangeLog();
-			userChangeLog.setDelFlag(0);
-			userChangeLog.setCreateTime(LocalDateTime.now());
-			userChangeLog.setAppUserId(appUser.getId());
-			userChangeLog.setBeforeVipId(vipId);
-			userChangeLog.setAfterVipId(appUser.getVipId());
-			userChangeLog.setChangeType(1);
-			userChangeLogClient.saveUserChangeLog(userChangeLog);
+		Integer earnPoint = order.getGetPoint();
+		AppUser appUser = appUserClient.getAppUserById(order.getAppUserId());
+		Integer lavePoint = appUser.getLavePoint();
+		BigDecimal paymentMoney = order.getPaymentAmount();
+		//构建积分流水记录
+		if(earnPoint > 0){
+			PointSetting pointSetting = pointSettingClient.getPointSetting(appUser.getVipId()).getData();
+			int earnPoint1 = 0;
+			if(null != pointSetting && 1 == pointSetting.getBuyPointOpen()){
+				earnPoint1 = new BigDecimal(earnPoint).multiply(pointSetting.getBuyPoint().divide(new BigDecimal(100))).intValue();
+			}
+			appUser.setShopPoint(appUser.getShopPoint() + earnPoint);
+			appUser.setLavePoint(appUser.getLavePoint() + earnPoint);
+			appUser.setTotalPoint(appUser.getTotalPoint() + earnPoint);
+			appUser.setAvailablePoint(appUser.getAvailablePoint() + earnPoint1);
+			appUser.setTotalAvailablePoint(appUser.getTotalAvailablePoint() + earnPoint1);
+
+			JSONObject jsonObject = new JSONObject();
+			jsonObject.put("shopPoint", earnPoint);
+			jsonObject.put("availablePoint", earnPoint1);
+			if(null != pointSetting && 1 == pointSetting.getBuyPointGift()){
+				appUser.setTransferablePoint(appUser.getTransferablePoint() + earnPoint1);
+				jsonObject.put("transferablePoint", earnPoint1);
+			}
+
+			UserPoint userPoint = new UserPoint();
+			userPoint.setType(1);
+			userPoint.setHistoricalPoint(lavePoint);
+			userPoint.setVariablePoint(earnPoint);
+			userPoint.setBalance(appUser.getLavePoint());
+			userPoint.setCreateTime(LocalDateTime.now());
+			userPoint.setAppUserId(appUser.getId());
+			userPoint.setObjectId(order.getId());
+			userPoint.setExtention(jsonObject.toJSONString());
+			userPointClient.saveUserPoint(userPoint);
+		}
+		appUser.setShopAmount(appUser.getShopAmount().add(paymentMoney).setScale(2, RoundingMode.HALF_EVEN));
+		appUser.setLastShopTime(LocalDateTime.now());
+		appUserClient.editAppUserById(appUser);
+		//变更等级
+		appUserClient.vipUpgrade(appUser.getId());
+		//修改订支付状态
+		order.setPayStatus(2);
+		//自提
+		if(order.getOrderType() == 1 && StringUtils.isEmpty(order.getAddressJson())){
+			order.setOrderStatus(2);
+		}
+		orderService.updateById(order);
+
+		//处理优惠券
+		if(null != order.getUserCouponId()){
+			UserCoupon userCoupon = userCouponClient.getUserCoupon(order.getUserCouponId()).getData();
+			if(null != userCoupon && null == userCoupon.getUseTime()){
+				userCoupon.setStatus(2);
+				userCoupon.setUseTime(LocalDateTime.now());
+				userCouponClient.editUserCoupon(userCoupon);
+			}
+		}
+		//添加查询快递信息队列
+		if(StringUtils.isNotEmpty(order.getExpressJson())){
+			//一小时后定时查询快递信息
+			redisTemplate.opsForZSet().add("order_express", order.getId(), LocalDateTime.now().plusHours(1).toEpochSecond(ZoneOffset.UTC));
+		}
+
+		//删除购物车数据
+		Long userid = tokenService.getLoginUserApplet().getUserid();
+		List<OrderGood> list = orderGoodService.list(new LambdaQueryWrapper<OrderGood>().eq(OrderGood::getOrderId, order.getId()));
+		List<Integer> goodsIds = list.stream().map(OrderGood::getGoodsId).collect(Collectors.toList());
+		this.remove(new LambdaQueryWrapper<ShoppingCart>().eq(ShoppingCart::getAppUserId, userid).in(ShoppingCart::getGoodsId, goodsIds));
+		return R.ok();
+	}
+	
+	
+	/**
+	 * 订单物流支付回调处理逻辑
+	 * @param uniPayCallbackResult
+	 * @return
+	 */
+	@Override
+	public R shoppingCartMaterialFlowPaymentCallback(UniPayCallbackResult uniPayCallbackResult) {
+		String r2_orderNo = uniPayCallbackResult.getR2_OrderNo();
+		r2_orderNo = r2_orderNo.substring(1);
+		Order order = orderService.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderNumber, r2_orderNo));
+		if(null == order || order.getPayStatus() == 2){
+			return R.ok();
+		}
+		Integer orderPoint = order.getPoint();
+		AppUser appUser = appUserClient.getAppUserById(order.getAppUserId());
+
+		Integer lavePoint = appUser.getLavePoint();
+		//扣减订单支付积分
+		appUser.setLavePoint(appUser.getLavePoint() - orderPoint);
+		appUser.setAvailablePoint(appUser.getAvailablePoint() - orderPoint);
+		//可转增积分
+		Integer transferablePoint = appUser.getTransferablePoint();
+		Integer tra = 0;
+		if(transferablePoint > 0){
+			tra = transferablePoint - orderPoint;
+			appUser.setTransferablePoint(tra >= 0 ? tra : 0);
+		}else{
+			appUser.setTransferablePoint(appUser.getTransferablePoint() - orderPoint);
+		}
+
+		//构建积分流水记录
+		UserPoint userPoint = new UserPoint();
+		userPoint.setType(11);
+		userPoint.setHistoricalPoint(lavePoint);
+		userPoint.setVariablePoint(orderPoint);
+		userPoint.setBalance(appUser.getLavePoint());
+		userPoint.setCreateTime(LocalDateTime.now());
+		userPoint.setAppUserId(appUser.getId());
+		userPoint.setObjectId(order.getId());
+		userPoint.setExtention((tra >= 0 ? orderPoint : transferablePoint) + "");
+		userPointClient.saveUserPoint(userPoint);
+
+		//积分支付不反积分
+
+		appUser.setLastShopTime(LocalDateTime.now());
+		appUserClient.editAppUserById(appUser);
+		//变更等级
+		appUserClient.vipUpgrade(appUser.getId());
+
+		//修改订支付状态
+		order.setPayStatus(2);
+		//自提
+		if(order.getOrderType() == 1 && StringUtils.isEmpty(order.getAddressJson())){
+			order.setOrderStatus(2);
+		}
+		orderService.updateById(order);
+		//删除购物车数据
+		Long userid = tokenService.getLoginUserApplet().getUserid();
+		List<OrderGood> list = orderGoodService.list(new LambdaQueryWrapper<OrderGood>().eq(OrderGood::getOrderId, order.getId()));
+		List<Integer> goodsIds = list.stream().map(OrderGood::getGoodsId).collect(Collectors.toList());
+		this.remove(new LambdaQueryWrapper<ShoppingCart>().eq(ShoppingCart::getAppUserId, userid).in(ShoppingCart::getGoodsId, goodsIds));
+		return R.ok();
+	}
+	
+	
+	/**
+	 * 定时任务关闭订单
+	 */
+	@Override
+	public void closeOrder() {
+		//订单支付数据
+		long second = LocalDateTime.now().toEpochSecond(ZoneOffset.UTC);
+		Set<String> orderPayment = redisTemplate.opsForZSet().rangeByScore("OrderPayment", 0, second);
+		if(orderPayment.size() > 0){
+			List<Order> list = orderService.list(new LambdaQueryWrapper<Order>().in(Order::getOrderNumber, orderPayment));
+			for (Order order : list) {
+				if(null == order || order.getPayStatus() != 1){
+					redisTemplate.opsForZSet().remove("OrderPayment", order.getOrderNumber());
+					continue;
+				}
+				//开始执行关闭订单操作
+				CloseOrderResult closeOrderResult = PaymentUtil.closeOrder(order.getOrderNumber());
+				if((null == closeOrderResult || !closeOrderResult.getRa_Status().equals("100")) &&
+						Arrays.asList("0", "4", "101", "10080000", "10080002", "10083004", "10083005").contains(closeOrderResult.getRb_Code())){
+					redisTemplate.opsForZSet().add("OrderPayment", order.getOrderNumber(), 0);
+					log.error("关闭订单失败:{}---->{}", order.getOrderNumber(), JSON.toJSONString(closeOrderResult));
+				}
+				redisTemplate.opsForZSet().remove("OrderPayment", order.getOrderNumber());
+			}
+		}
+		
+		//快递支付
+		Set<String> materialFlowPayment = redisTemplate.opsForZSet().rangeByScore("MaterialFlowPayment", 0, second);
+		if(materialFlowPayment.size() > 0){
+			materialFlowPayment.forEach(s->s.substring(1));
+			List<Order> list = orderService.list(new LambdaQueryWrapper<Order>().in(Order::getOrderNumber, materialFlowPayment));
+			for (Order order : list) {
+				if(null == order || order.getPayStatus() != 1){
+					redisTemplate.opsForZSet().remove("MaterialFlowPayment", order.getOrderNumber());
+					continue;
+				}
+				//开始执行关闭订单操作
+				CloseOrderResult closeOrderResult = PaymentUtil.closeOrder("K" + order.getOrderNumber());
+				if((null == closeOrderResult || !closeOrderResult.getRa_Status().equals("100")) &&
+						Arrays.asList("0", "4", "101", "10080000", "10080002", "10083004", "10083005").contains(closeOrderResult.getRb_Code())){
+					redisTemplate.opsForZSet().add("MaterialFlowPayment", order.getOrderNumber(), 0);
+					log.error("关闭订单失败:{}---->{}", order.getOrderNumber(), JSON.toJSONString(closeOrderResult));
+				}
+				redisTemplate.opsForZSet().remove("MaterialFlowPayment", order.getOrderNumber());
+			}
 		}
 	}
 }

--
Gitblit v1.7.1