交易处理

src/main/java/org/springblade/Application.java

@@ -19,6 +19,9 @@ package org.springblade;
 import org.springblade.common.constant.CommonConstant;
 import org.springblade.core.launch.BladeApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 /**
@@ -26,7 +29,10 @@ import org.springframework.scheduling.annotation.EnableScheduling;
  *
  * @author Chill
  */
+@EnableAsync
 @EnableScheduling
+@EnableCaching
+@EnableConfigurationProperties
 @SpringBootApplication
 public class Application {
 

src/main/java/org/springblade/common/OrderType.java

@@ -1,22 +0,0 @@
-package org.springblade.common;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * @author: lianghanqiang
- * @description: 订单类型
- * @since: 7/29/21 -- 1:56 PM
- */
-@AllArgsConstructor
-@Getter
-public enum OrderType {
-
-	/* 用户付款 */
-	USER_PAY("USER_PAY"),
-	AGENT_CHARGE("AGENT_CHARGE"),
-	MALL_CHARGE("MALL_CHARGE");
-
-	String name;
-
-}

src/main/java/org/springblade/common/enums/OrderType.java

@@ -15,7 +15,13 @@ public enum OrderType {
 	/* 用户付款 */
 	USER_PAY("USER_PAY"),
 	AGENT_CHARGE("AGENT_CHARGE"),
-	MALL_CHARGE("MALL_CHARGE");
+	MALL_CHARGE("MALL_CHARGE"),
+
+	/**
+	 * 余额,积分交易
+	 * */
+	MALL_SEND("mall_send"),
+	PAY_CONSUMER("mall_send");
 
 	String name;
 

src/main/java/org/springblade/common/enums/ResCode.java

@@ -18,6 +18,7 @@ public enum ResCode implements IResultCode {
 	PAY_TYPE_ERROR(501,"支付方式错误"),
 	PAY_SCENE_ERROR(501,"支付场景错误"),
 	TRADE_ERROR(501,"交易异常"),
+	USER_PAY_CALLBACK_ERROR(501,"用户支付回调异常"),
 
 
 	/*	动态密码	*/

src/main/java/org/springblade/gateway/shop_gateway/controller/ShopTradeController.java

@@ -7,9 +7,8 @@ import org.springblade.common.enums.ResCode;
 import org.springblade.common.utils.OtpUtils;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.tool.api.R;
-import org.springblade.gateway.common_gateway.handle.ChannelPointHandle;
-import org.springblade.gateway.common_gateway.handle.Trade;
-import org.springblade.gateway.common_gateway.handle.entity.Order;
+import org.springblade.payment.handle.Trade;
+import org.springblade.payment.handle.entity.Order;
 import org.springblade.gateway.shop_gateway.entity.dto.CodeOrder;
 import org.springblade.ldt.user.entity.LoginUser;
 import org.springblade.ldt.user.service.ILoginUserService;
@@ -19,7 +18,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.math.BigDecimal;
 import java.util.Map;
 
 /**

src/main/java/org/springblade/ldt/bills/entity/BalanceBills.java

@@ -82,6 +82,11 @@ public class BalanceBills implements Serializable {
 	*/
 		@ApiModelProperty(value = "交易状态")
 		private String status;
+	/**
+	* 交易类型
+	*/
+		@ApiModelProperty(value = "交易类型")
+		private String type;
 
 
 }

src/main/java/org/springblade/ldt/bills/entity/PointBills.java

@@ -82,6 +82,11 @@ public class PointBills implements Serializable {
 	*/
 		@ApiModelProperty(value = "交易状态")
 		private String status;
+	/**
+	* 交易类型
+	*/
+		@ApiModelProperty(value = "交易类型")
+		private String type;
 
 
 }

src/main/java/org/springblade/ldt/bills/mapper/BalanceBillsMapper.xml

@@ -13,6 +13,7 @@
         <result column="fee" property="fee"/>
         <result column="receive_id" property="receiveId"/>
         <result column="status" property="status"/>
+        <result column="type" property="type"/>
     </resultMap>
 
 

src/main/java/org/springblade/ldt/bills/mapper/PointBillsMapper.xml

@@ -13,6 +13,7 @@
         <result column="fee" property="fee"/>
         <result column="receive_id" property="receiveId"/>
         <result column="status" property="status"/>
+        <result column="type" property="type"/>
     </resultMap>
 
 

src/main/java/org/springblade/payment/listener/AgentChargeListener.java → src/main/java/org/springblade/payment/callback/AgentChargeCallback.java

@@ -1,4 +1,4 @@
-package org.springblade.payment.listener;
+package org.springblade.payment.callback;
 
 import cn.hutool.core.lang.Assert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -26,7 +26,7 @@ import java.util.Objects;
  * @since: 8/5/21 -- 3:01 PM
  */
 @Component
-public class AgentChargeListener {
+public class AgentChargeCallback {
 
 	@Autowired
 	IBillsService billsService;
@@ -46,7 +46,7 @@ public class AgentChargeListener {
 		//获取订单信息
 		Bills bills = billsService.getById(successParams.getBillId());
 		Assert.notNull(bills, "支付记录中无此订单");
-//		bills.setChannelId(successParams.getPlatformId());
+		bills.setChannelId(successParams.getChannelId());
 
 		//判断订单状态，已付款订单处理 （单笔支付可能接收多笔回调）
 		if (Objects.equals(bills.getPaystatus(), SystemConstant.BillPayStatus.付款成功.name())) {

src/main/java/org/springblade/payment/listener/MallChargeListener.java → src/main/java/org/springblade/payment/callback/MallChargeCallback.java

@@ -1,4 +1,4 @@
-package org.springblade.payment.listener;
+package org.springblade.payment.callback;
 
 import org.springblade.payment.entity.SuccessParams;
 import org.springblade.payment.event.MallChargeEvent;
@@ -13,7 +13,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @since: 8/5/21 -- 3:01 PM
  */
 @Component
-public class MallChargeListener {
+public class MallChargeCallback {
 
 
 	@EventListener

src/main/java/org/springblade/payment/callback/UserPayCallback.java

@@ -0,0 +1,141 @@
+package org.springblade.payment.callback;
+
+
+import lombok.AllArgsConstructor;
+import org.springblade.common.enums.OrderType;
+import org.springblade.common.enums.ResCode;
+import org.springblade.common.enums.SystemConstant;
+import org.springblade.core.log.exception.ServiceException;
+import org.springblade.ldt.bills.entity.BalanceBills;
+import org.springblade.ldt.bills.entity.Bills;
+import org.springblade.ldt.bills.entity.PointBills;
+import org.springblade.ldt.bills.service.IBalanceBillsService;
+import org.springblade.ldt.bills.service.IBillsService;
+import org.springblade.ldt.bills.service.IPointBillsService;
+import org.springblade.ldt.mall.entity.Mall;
+import org.springblade.ldt.mall.service.IMallService;
+import org.springblade.ldt.shop.entity.Shop;
+import org.springblade.ldt.shop.service.IShopService;
+import org.springblade.ldt.user.entity.LoginUser;
+import org.springblade.ldt.user.service.ILoginUserService;
+import org.springblade.payment.entity.SuccessParams;
+import org.springblade.payment.event.UserPayEvent;
+import org.springframework.context.event.EventListener;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.Assert;
+
+import java.math.BigDecimal;
+import java.util.Objects;
+
+/**
+ * @author: lianghanqiang
+ * @description: 用户付款回调
+ * @since: 8/5/21 -- 3:01 PM
+ */
+@Component
+@AllArgsConstructor
+public class UserPayCallback {
+
+	private ILoginUserService loginUserService;
+	private IBillsService billsService;
+	private IPointBillsService pointBillsService;
+	private IBalanceBillsService balanceBillsService;
+	private IShopService shopService;
+	private IMallService mallService;
+
+
+	@EventListener
+	@Async
+	@Transactional
+	public void PaySuccess(UserPayEvent userPayEvent){
+		SuccessParams successParams = userPayEvent.getSuccessParams();
+
+		//获取对应交易的积分账单、余额账单、支付账单以及交易用户
+		LoginUser user = loginUserService.getById(successParams.getUserId());
+		Bills bills = Objects.isNull(successParams.getBillId())? null: billsService.getById(successParams.getBillId());
+		PointBills pointBills = Objects.isNull(successParams.getPointBillsId())? null: pointBillsService.getById(successParams.getPointBillsId());
+		BalanceBills balanceBills = Objects.isNull(successParams.getBalanceBillsId())? null: balanceBillsService.getById(successParams.getBalanceBillsId());
+
+		if(!Objects.isNull(pointBills)){
+			Assert.isTrue(handlePointBills(pointBills,user),() ->{throw new ServiceException(ResCode.USER_PAY_CALLBACK_ERROR);});
+		}
+
+		if(!Objects.isNull(balanceBills)){
+			Assert.isTrue(handleBalanceBills(balanceBills,user),() ->{throw new ServiceException(ResCode.USER_PAY_CALLBACK_ERROR);});
+		}
+
+		if(!Objects.isNull(bills)){
+			Assert.isTrue(handleBills(bills,user,pointBills,balanceBills),() ->{throw new ServiceException(ResCode.USER_PAY_CALLBACK_ERROR);});
+		}
+
+		//修改用户积分余额
+		Assert.isTrue(loginUserService.saveOrUpdate(user),() ->{throw new ServiceException(ResCode.USER_PAY_CALLBACK_ERROR);});
+	}
+
+
+
+
+
+
+	/**
+	 * 修改用户积分以及积分账单状态
+	 * */
+	private boolean handlePointBills(PointBills pointBills, LoginUser user) {
+		user.setChannelPoint(user.getChannelPoint()-pointBills.getPrice());
+		pointBills.setStatus(SystemConstant.BillPayStatus.付款成功.name());
+		return pointBillsService.saveOrUpdate(pointBills);
+	}
+
+	/**
+	 * 修改用户账户余额以及余额账单状态
+	 * */
+	private boolean handleBalanceBills(BalanceBills balanceBills, LoginUser user) {
+		user.setBalance(user.getBalance()-balanceBills.getPrice());
+		balanceBills.setStatus(SystemConstant.BillPayStatus.付款成功.name());
+		return balanceBillsService.saveOrUpdate(balanceBills);
+	}
+
+	/**
+	 * 修改支付账单状态
+	 * */
+	private boolean handleBills(Bills bills, LoginUser user, PointBills pointBills, BalanceBills balanceBills) {
+		//补充更新订单信息
+		if(!Objects.isNull(pointBills)){
+			bills.setPointNum(pointBills.getPrice());
+		}
+		if(!Objects.isNull(balanceBills)){
+			bills.setBalanceNum(balanceBills.getPrice());
+		}
+		bills.setPaystatus(SystemConstant.BillPayStatus.付款成功.name());
+		return billsService.saveOrUpdate(bills) && sendPoint(bills,user);
+	}
+
+	/**
+	 * 商场赠送用户积分
+	 **/
+	private boolean sendPoint(Bills bills,LoginUser user){
+		//赠送用户积分
+		BigDecimal payNum = bills.getPrice();
+		Shop shop = shopService.getById(bills.getReceiveId());
+		Mall mall = mallService.getById(shop.getMallId());
+
+		PointBills sendBill = new PointBills();
+		sendBill.setType(OrderType.MALL_SEND.name());
+		sendBill.setStatus(SystemConstant.BillPayStatus.待付款.name());
+		sendBill.setTitle("商场赠送积分");
+		sendBill.setReceiveId(user.getId());
+
+		if(!Objects.isNull(mall)){
+			double balance = mall.getBalance();
+			double pointRate = mall.getPointRate();
+			double sendNum = payNum.multiply(BigDecimal.valueOf(pointRate)).doubleValue();
+
+
+		}else{
+			sendBill.setDesc("商场不存在");
+		}
+		return pointBillsService.saveOrUpdate(sendBill);
+	}
+}

src/main/java/org/springblade/payment/entity/SuccessParams.java

@@ -49,4 +49,13 @@ public class SuccessParams {
 	 * */
 	private double totalPrice;
 
+	/**
+	 * 第三方平台交易订单号
+	 * */
+	private String channelId;
+
+	/**
+	 * 	交易用户id
+	 * */
+	private Long userId;
 }

src/main/java/org/springblade/gateway/common_gateway/handle/Trade.java → src/main/java/org/springblade/payment/handle/Trade.java

@@ -1,21 +1,19 @@
-package org.springblade.gateway.common_gateway.handle;
+package org.springblade.payment.handle;
 
 import lombok.AllArgsConstructor;
 import org.springblade.common.enums.OrderType;
 import org.springblade.common.enums.ResCode;
 import org.springblade.common.enums.SystemConstant;
 import org.springblade.core.log.exception.ServiceException;
-import org.springblade.gateway.common_gateway.handle.entity.HandleData;
-import org.springblade.gateway.common_gateway.handle.entity.Order;
+import org.springblade.payment.handle.entity.HandleData;
+import org.springblade.payment.handle.entity.Order;
+import org.springblade.payment.handle.handler.*;
 import org.springblade.ldt.activity.service.IActivityService;
 import org.springblade.ldt.activity.service.IJoinRecordService;
 import org.springblade.ldt.bills.service.IBalanceBillsService;
 import org.springblade.ldt.bills.service.IBillsService;
 import org.springblade.ldt.bills.service.IPointBillsService;
-import org.springblade.ldt.mall.service.IMallService;
-import org.springblade.ldt.platform.service.IPlatformSettingService;
 import org.springblade.ldt.shop.service.IShopService;
-import org.springblade.ldt.user.service.ILoginUserService;
 import org.springblade.payment.entity.SuccessParams;
 import org.springblade.payment.service.IPaymentService;
 import org.springblade.webSocket.WebSocketServer;
@@ -71,6 +69,7 @@ public class Trade {
 		SuccessParams successParams  = SuccessParams.builder()
 			.orderType(OrderType.USER_PAY.name())
 			.status(SystemConstant.BillPayStatus.待付款.name())
+			.userId(order.getLoginUser().getId())
 			.totalPrice(order.getMoney())
 			.build();
 

src/main/java/org/springblade/gateway/common_gateway/handle/entity/HandleData.java → src/main/java/org/springblade/payment/handle/entity/HandleData.java

@@ -1,4 +1,4 @@
-package org.springblade.gateway.common_gateway.handle.entity;
+package org.springblade.payment.handle.entity;
 
 import lombok.Builder;
 import lombok.Data;

src/main/java/org/springblade/gateway/common_gateway/handle/entity/Order.java → src/main/java/org/springblade/payment/handle/entity/Order.java

@@ -1,11 +1,10 @@
-package org.springblade.gateway.common_gateway.handle.entity;
+package org.springblade.payment.handle.entity;
 
 import lombok.Builder;
 import lombok.Data;
 import org.joda.time.DateTime;
 import org.springblade.ldt.user.entity.LoginUser;
 
-import java.util.Date;
 
 /**
  * @author: lianghanqiang

src/main/java/org/springblade/gateway/common_gateway/handle/BalanceHandle.java → src/main/java/org/springblade/payment/handle/handler/BalanceHandle.java

@@ -1,11 +1,12 @@
-package org.springblade.gateway.common_gateway.handle;
+package org.springblade.payment.handle.handler;
 
 import lombok.AllArgsConstructor;
+import org.springblade.common.enums.OrderType;
 import org.springblade.common.enums.ResCode;
 import org.springblade.common.enums.SystemConstant;
 import org.springblade.core.log.exception.ServiceException;
-import org.springblade.gateway.common_gateway.handle.entity.HandleData;
-import org.springblade.gateway.common_gateway.handle.entity.Order;
+import org.springblade.payment.handle.entity.HandleData;
+import org.springblade.payment.handle.entity.Order;
 import org.springblade.ldt.bills.entity.BalanceBills;
 import org.springblade.ldt.bills.service.IBalanceBillsService;
 import org.springblade.ldt.user.entity.LoginUser;
@@ -62,6 +63,7 @@ public class BalanceHandle implements BaseHandle {
 	private BalanceBills addBillRecord(Order order, LoginUser user, Double price) {
 		BalanceBills balanceBills = new BalanceBills();
 		balanceBills.setReceiveId(order.getShopId());
+		balanceBills.setType(OrderType.PAY_CONSUMER.name());
 		balanceBills.setStatus(SystemConstant.BillPayStatus.待付款.name());
 		balanceBills.setTitle("商家扫码收款");
 		balanceBills.setPayId(user.getId());

src/main/java/org/springblade/gateway/common_gateway/handle/BaseHandle.java → src/main/java/org/springblade/payment/handle/handler/BaseHandle.java

@@ -1,7 +1,7 @@
-package org.springblade.gateway.common_gateway.handle;
+package org.springblade.payment.handle.handler;
 
-import org.springblade.gateway.common_gateway.handle.entity.HandleData;
-import org.springblade.gateway.common_gateway.handle.entity.Order;
+import org.springblade.payment.handle.entity.HandleData;
+import org.springblade.payment.handle.entity.Order;
 import org.springblade.payment.entity.SuccessParams;
 
 import java.math.BigDecimal;

src/main/java/org/springblade/gateway/common_gateway/handle/ChannelPointHandle.java → src/main/java/org/springblade/payment/handle/handler/ChannelPointHandle.java

@@ -1,12 +1,12 @@
-package org.springblade.gateway.common_gateway.handle;
+package org.springblade.payment.handle.handler;
 
 import lombok.AllArgsConstructor;
 import org.springblade.common.enums.OrderType;
 import org.springblade.common.enums.ResCode;
 import org.springblade.common.enums.SystemConstant;
 import org.springblade.core.log.exception.ServiceException;
-import org.springblade.gateway.common_gateway.handle.entity.HandleData;
-import org.springblade.gateway.common_gateway.handle.entity.Order;
+import org.springblade.payment.handle.entity.HandleData;
+import org.springblade.payment.handle.entity.Order;
 import org.springblade.ldt.bills.entity.PointBills;
 import org.springblade.ldt.bills.service.IPointBillsService;
 import org.springblade.ldt.user.entity.LoginUser;
@@ -63,6 +63,7 @@ public class ChannelPointHandle implements BaseHandle {
 	 * @return*/
 	private PointBills addBillRecord(Order order, LoginUser user, Double price) {
 		PointBills pointBills = new PointBills();
+		pointBills.setType(OrderType.PAY_CONSUMER.name());
 		pointBills.setPayId(user.getId());
 		pointBills.setReceiveId(order.getShopId());
 		pointBills.setStatus(SystemConstant.BillPayStatus.付款成功.name());

src/main/java/org/springblade/gateway/common_gateway/handle/DiscountHandle.java → src/main/java/org/springblade/payment/handle/handler/DiscountHandle.java

@@ -1,12 +1,11 @@
-package org.springblade.gateway.common_gateway.handle;
+package org.springblade.payment.handle.handler;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import io.github.classgraph.utils.Join;
 import lombok.AllArgsConstructor;
 import org.springblade.common.cache.PlatformCache;
 import org.springblade.common.config.entity.PlatformConfig;
-import org.springblade.gateway.common_gateway.handle.entity.HandleData;
-import org.springblade.gateway.common_gateway.handle.entity.Order;
+import org.springblade.payment.handle.entity.HandleData;
+import org.springblade.payment.handle.entity.Order;
 import org.springblade.ldt.activity.entity.Activity;
 import org.springblade.ldt.activity.entity.JoinRecord;
 import org.springblade.ldt.activity.service.IActivityService;

src/main/java/org/springblade/gateway/common_gateway/handle/WxPayHandle.java → src/main/java/org/springblade/payment/handle/handler/WxPayHandle.java

@@ -1,4 +1,4 @@
-package org.springblade.gateway.common_gateway.handle;
+package org.springblade.payment.handle.handler;
 
 import cn.hutool.core.convert.Convert;
 import com.alibaba.fastjson.JSON;
@@ -8,8 +8,8 @@ import org.springblade.common.enums.PaymentType;
 import org.springblade.common.enums.ResCode;
 import org.springblade.common.enums.SystemConstant;
 import org.springblade.core.log.exception.ServiceException;
-import org.springblade.gateway.common_gateway.handle.entity.HandleData;
-import org.springblade.gateway.common_gateway.handle.entity.Order;
+import org.springblade.payment.handle.entity.HandleData;
+import org.springblade.payment.handle.entity.Order;
 import org.springblade.ldt.bills.entity.Bills;
 import org.springblade.ldt.bills.service.IBillsService;
 import org.springblade.payment.entity.SuccessParams;

src/main/java/org/springblade/payment/listener/UserPayListener.java

@@ -1,25 +0,0 @@
-package org.springblade.payment.listener;
-
-
-import org.springblade.payment.entity.SuccessParams;
-import org.springblade.payment.event.UserPayEvent;
-import org.springframework.context.event.EventListener;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * @author: lianghanqiang
- * @description: 用户付款回调
- * @since: 8/5/21 -- 3:01 PM
- */
-@Component
-public class UserPayListener {
-
-	@EventListener
-	@Async
-	@Transactional
-	public void PaySuccess(UserPayEvent userPayEvent){
-		SuccessParams successParams = userPayEvent.getSuccessParams();
-	}
-}

src/main/java/org/springblade/payment/plugin/YeePayPlugin.java

@@ -5,8 +5,8 @@ import cn.hutool.core.lang.Assert;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
-import org.springblade.common.OrderType;
 import org.springblade.common.cache.PaymentCache;
+import org.springblade.common.enums.OrderType;
 import org.springblade.common.enums.PaymentType;
 import org.springblade.core.tool.api.R;
 import org.springblade.ldt.bills.entity.Bills;

src/main/java/org/springblade/payment/service/impl/PaymentService.java

@@ -1,6 +1,6 @@
 package org.springblade.payment.service.impl;
 
-import org.springblade.common.OrderType;
+import org.springblade.common.enums.OrderType;
 import org.springblade.payment.entity.SuccessParams;
 import org.springblade.payment.event.AgentChargeEvent;
 import org.springblade.payment.event.MallChargeEvent;