更新

src/main/java/org/springblade/gateway/point_gateway/controller/PointExchangeController.java

@@ -64,18 +64,8 @@ public class PointExchangeController {
 			setOpenId(openId);
 			setUsePoint(point);
 		}};
-//		if (type == 1){
-//			pointExchangeService.pointExchange(yeepayOrder);
-//			return R.data(yeepayOrder);
-//		}else if (type == 0){
-//			return R.data(pointExchangeService.cashExchange(yeepayOrder));
-//		}else if (type == 2){
-//			if (point != null){
-//				return R.data(pointExchangeService.hybridExchange(yeepayOrder));
-//			}
-//		}
 
-		return R.data(pointExchangeService.merge(yeepayOrder,type));
+		return R.data(pointExchangeService.mergePay(yeepayOrder,type));
 	}
 
 	/**

src/main/java/org/springblade/gateway/point_gateway/service/PointExchangeService.java

@@ -7,39 +7,18 @@ import java.math.BigDecimal;
 import java.util.HashMap;
 
 public interface PointExchangeService {
-	/**
-	 * 积分兑换
-	 * @param yeepayOrder
-	 * @return
-	 */
-	void pointExchange(YeepayOrder yeepayOrder);
-
-	/**
-	 * 现金兑换
-	 * @param yeepayOrder
-	 * @return
-	 */
-	HashMap<String, Object> cashExchange(YeepayOrder yeepayOrder) throws Exception;
-
 	/**
 	 * 现金支付回调
 	 * @param request
 	 */
 	void goodsHandlerCasePropsOrder(HttpServletRequest request);
 
-	/**
-	 * 混合支付
-	 * @param yeepayOrder
-	 * @return
-	 */
-	HashMap<String, Object> hybridExchange(YeepayOrder yeepayOrder) throws Exception;
-
 	/**
 	 * 支付合并
 	 * @param yeepayOrder
 	 * @param type
 	 * @return
 	 */
-	HashMap<String,Object> merge(YeepayOrder yeepayOrder,int type) throws Exception;
+	HashMap<String,Object> mergePay(YeepayOrder yeepayOrder,int type) throws Exception;
 }
 

src/main/java/org/springblade/gateway/point_gateway/service/impl/PointExchangeServiceImpl.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeepay.yop.sdk.service.common.response.YopResponse;
 import io.jsonwebtoken.lang.Assert;
+import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -49,46 +50,22 @@ import java.util.Optional;
 
 @Service
 @Slf4j
+@AllArgsConstructor
 public class PointExchangeServiceImpl implements PointExchangeService {
 
-	@Autowired
 	private IPointGoodsService pointGoodsService;
-	@Autowired
 	private IPointRecordService pointRecordService;
-	@Autowired
 	private IUserPufaPointService userPufaPointService;
-	@Autowired
 	private IUserAddressService userAddressService;
-	@Autowired
 	private IGoodsOrderService goodsOrderService;
-	@Autowired
 	private HttpServletRequest request;
-	@Autowired
 	private YeepaySaasService yeepaySaasService;
-	@Autowired
 	private IYeepayOrderService yeepayOrderService;
-	@Autowired
 	private YeePayConst yeePayConst;
-	@Autowired
 	private BladeLogger bladeLogger;
-	@Autowired
 	private YeePayService yeePayService;
-	@Autowired
 	private ConfigForOfficial configForOfficial;
 
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public void pointExchange(YeepayOrder yeepayOrder) {
-
-	}
-
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public HashMap<String, Object> cashExchange(YeepayOrder yeepayOrder) throws Exception {
-
-		return null;
-	}
-
 	@Transactional(rollbackFor = Exception.class)
 	void createOrder(YeepayOrder yeepayOrder) {
 
@@ -167,14 +144,7 @@ public class PointExchangeServiceImpl implements PointExchangeService {
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public HashMap<String, Object> hybridExchange(YeepayOrder yeepayOrder) throws Exception {
-
-		return null;
-	}
-
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public HashMap<String, Object> merge(YeepayOrder yeepayOrder, int type) throws Exception {
+	public HashMap<String, Object> mergePay(YeepayOrder yeepayOrder, int type) throws Exception {
 		HashMap<String, Object> map = new HashMap<>();
 		if (yeepayOrder.getUsePoint() != null && (yeepayOrder.getUsePoint().compareTo(BigDecimal.ZERO) < 0)) {
 			throw new PointExchangeException("请输入有效积分值");
@@ -218,6 +188,7 @@ public class PointExchangeServiceImpl implements PointExchangeService {
 			Assert.isTrue(userPufaPointService.saveOrUpdate(user), "兑换失败");
 			yeepayOrder.setUserId(user.getUserId());
 			yeepayOrder.setUsePoint(exchangePoint);
+			yeepayOrder.setPhone(address.getPhone());
 			//下单
 			createOrder(yeepayOrder);
 			//添加积分消费
@@ -242,7 +213,7 @@ public class PointExchangeServiceImpl implements PointExchangeService {
 				//如果用户输入的积分足够,则使用积分支付
 				if (yeepayOrder.getUsePoint().compareTo(exchangePoint) > 0) {
 					type = 1;
-					return this.merge(yeepayOrder, type);
+					return this.mergePay(yeepayOrder, type);
 				}
 				//需要的现金
 				BigDecimal usePoint = exchangePoint.subtract(yeepayOrder.getUsePoint());