Merge branch 'master' of http://git.dayaedu.com/yonge/cooleshow

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserOrderServiceImpl.java

@@ -68,8 +68,6 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
     private MusicSheetService musicSheetService;
     @Autowired
     private RedissonClient redissonClient;
-    @Autowired
-    private PaymentProperties paymentProperties;
 
     //验证订单是否可以下单,获取订单金额信息
     private static final Map<GoodTypeEnum, Function<OrderReq.OrderReqInfo, HttpResponseResult<OrderCreateRes>>> orderCreate = new HashMap<>();
@@ -182,6 +180,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
         if (!StringUtil.isEmpty(detail.getTransNo())) {
             Payment param = new Payment(detail.getOpenType(), detail.getPayChannel());
             param.setId(detail.getTransNo());
+            param.setPaymentNo(detail.getPaymentNo());
             BaseResult<Payment> res = paymentClient.queryPayment(param);
             //支付成功
             if (res.getStatus() && TradeStatusEnum.succeeded.getCode().equals(res.getData().getStatus())) {
@@ -420,6 +419,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
         if (!StringUtil.isEmpty(detail.getTransNo())) {
             Payment param = new Payment(detail.getOpenType(), detail.getPayChannel());
             param.setId(detail.getTransNo());
+            param.setPaymentNo(detail.getPaymentNo());
             BaseResult<Payment> res = paymentClient.queryPayment(param);
             //支付成功
             if (res.getStatus() && TradeStatusEnum.succeeded.getCode().equals(res.getData().getStatus())

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/MyFollow.java

@@ -31,9 +31,19 @@ public class MyFollow extends BaseEntity {
 
     @ApiModelProperty("音乐人(0:否 1:是)")
     private Integer musicianFlag;
+    @ApiModelProperty("老师入驻(0:否 1:是)")
+    private Integer entryFlag;
     @ApiModelProperty("专业技能")
     private String subjectName;
 
+    public Integer getEntryFlag() {
+        return entryFlag;
+    }
+
+    public void setEntryFlag(Integer entryFlag) {
+        this.entryFlag = entryFlag;
+    }
+
     public String getUserId() {
         return userId;
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/UserOrderVo.java

@@ -23,8 +23,10 @@ public class UserOrderVo extends UserOrder {
 	private OpenEnum openType;
 	@ApiModelProperty("支付渠道:  alipay 支付宝  wx_lite 微信 ")
 	private PayChannelEnum payChannel;
-	@ApiModelProperty("交易流水号 ")
+	@ApiModelProperty("三方交易流水号 ")
 	private String transNo;
+	@ApiModelProperty("付款订单号 ")
+	private String paymentNo;
 	@ApiModelProperty("收取的服务费 ")
 	private BigDecimal feeAmt;
 	@ApiModelProperty("用户昵称")
@@ -87,4 +89,12 @@ public class UserOrderVo extends UserOrder {
 	public void setPhone(String phone) {
 		this.phone = phone;
 	}
+
+	public String getPaymentNo() {
+		return paymentNo;
+	}
+
+	public void setPaymentNo(String paymentNo) {
+		this.paymentNo = paymentNo;
+	}
 }

cooleshow-user/user-biz/src/main/resources/config/mybatis/StudentMapper.xml

@@ -129,6 +129,7 @@
             t.exp_time_ AS expTime,
 
             tr.musician_flag_ AS musicianFlag,
+            tr.entry_flag_ AS entryFlag,
             (SELECT group_concat(name_) FROM `subject` WHERE find_in_set(id_,tr.subject_id_)) AS subjectName
         FROM student_star s
         LEFT JOIN sys_user u ON s.teacher_id_ = u.id_

cooleshow-user/user-biz/src/main/resources/config/mybatis/UserOrderMapper.xml

@@ -45,7 +45,10 @@
     <select id="detailById" resultType="com.yonge.cooleshow.biz.dal.vo.UserOrderVo">
         SELECT
             <include refid="baseColumns"/>,
+            p.open_type_ as openType,
+            p.pay_channel_ as payChannel,
             p.trans_no_ as transNo,
+            p.payment_no_ as paymentNo,
             p.fee_amt_ as feeAmt,
             u.username_ as username,
             u.phone_ as phone
@@ -58,7 +61,9 @@
         SELECT
             <include refid="baseColumns"/>,
             p.open_type_ as openType,
+            p.pay_channel_ as payChannel,
             p.trans_no_ as transNo,
+            p.payment_no_ as paymentNo,
             p.fee_amt_ as feeAmt,
             u.username_ as username,
             u.phone_ as phone
@@ -76,7 +81,8 @@
             <include refid="baseColumns"/>,
             p.open_type_ as openType,
             p.pay_channel_ as payChannel,
-            p.trans_no_ as transNo
+            p.trans_no_ as transNo,
+            p.payment_no_ as paymentNo
         FROM user_order t
         left join user_order_payment p on t.order_no_ = p.order_no_ and (p.status_ = 'pending' or p.status_ = 'succeeded')
         where t.user_id_ = #{param.userId}
@@ -94,6 +100,7 @@
             p.open_type_ as openType,
             p.pay_channel_ as payChannel,
             p.trans_no_ as transNo,
+            p.payment_no_ as paymentNo,
             p.fee_amt_ as feeAmt,
             u.username_ as username,
             u.phone_ as phone
@@ -169,7 +176,7 @@
             p.open_type_ as openType,
             p.pay_channel_ as payChannel,
             p.trans_no_ as transNo,
-            p.pay_channel_ as payChannel
+            p.payment_no_ as paymentNo
         FROM user_order t
         left join user_order_payment p on t.order_no_ = p.order_no_ and (p.status_ = 'pending' or p.status_ = 'succeeded')
         where t.status_ in ('WAIT_PAY','PAYING')

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/PaymentController.java

@@ -50,15 +50,16 @@ public class PaymentController extends BaseController {
 
     @ApiOperation(value = "查询付款单")
     @GetMapping("/queryPayment")
-    public HttpResponseResult<Payment> queryPayment(String transNo) throws Exception {
+    public HttpResponseResult<Payment> queryPayment(String paymentNo) throws Exception {
         UserOrderPayment userOrderPayment = paymentService.getOne(Wrappers.<UserOrderPayment>lambdaQuery()
-                .eq(UserOrderPayment::getTransNo, transNo)
+                .eq(UserOrderPayment::getPaymentNo, paymentNo)
         );
         if (null == userOrderPayment) {
             return HttpResponseResult.succeed();
         }
         Payment param = new Payment(userOrderPayment.getOpenType(), userOrderPayment.getPayChannel());
         param.setId(userOrderPayment.getTransNo());
+        param.setPaymentNo(userOrderPayment.getPaymentNo());
         BaseResult<Payment> paymentBaseResult = paymentClient.queryPayment(param);
         return HttpResponseResult.status(paymentBaseResult);
     }
@@ -89,12 +90,12 @@ public class PaymentController extends BaseController {
             @PathVariable("payMethod") String payMethod,
             HttpServletRequest request
     ) {
-        if(OpenEnum.ADAPAY.getCode().equals(openType)){
+        if (OpenEnum.ADAPAY.getCode().equals(openType)) {
             adapayCallbackHandle(request);
         }
     }
 
-    private void adapayCallbackHandle(HttpServletRequest request){
+    private void adapayCallbackHandle(HttpServletRequest request) {
         try {
             //验签传参data
             String data = request.getParameter("data");

toolset/toolset-payment/src/main/java/com/yonge/toolset/payment/base/enums/OpenEnum.java

@@ -1,5 +1,6 @@
 package com.yonge.toolset.payment.base.enums;
 
+import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.yonge.toolset.base.enums.BaseEnum;
 
 /**
@@ -13,6 +14,7 @@ public enum OpenEnum implements BaseEnum<String, OpenEnum> {
     ORIGINAL("微信支付宝"),
     ADAPAY("汇付");
 
+    @EnumValue
     private String code;
     private String msg;
 

toolset/toolset-payment/src/main/java/com/yonge/toolset/payment/base/enums/TradeStatusEnum.java

@@ -14,6 +14,7 @@ public enum TradeStatusEnum implements BaseEnum<String, TradeStatusEnum> {
     succeeded("交易成功"),
     failed("交易失败"),
     close("交易关闭");
+
     @EnumValue
     private String code;
     private String msg;

toolset/toolset-payment/src/main/java/com/yonge/toolset/payment/core/service/PaymentClient.java

@@ -31,7 +31,7 @@ public interface PaymentClient {
     BaseResult<Payment> executePayment(Payment payment);
 
     /***
-     * 统一下单接口
+     * 统一查询接口
      * @author liweifan
      * @param: product 订单对象
      * @updateTime 2022/3/4 15:12

toolset/toolset-payment/src/main/java/com/yonge/toolset/payment/original/ali/OriginalAliAppTemplate.java

@@ -73,6 +73,7 @@ public class OriginalAliAppTemplate implements PaymentTemplate {
             if (response.isSuccess()) {
                 payment.setId(response.getTradeNo());
                 payment.setStatus(TradeStatusEnum.pending);
+                payment.setPayInfo(response.getBody());
                 return BaseResult.succeed(payment);
             } else {
                 return BaseResult.failed(response.getMsg());
@@ -91,7 +92,9 @@ public class OriginalAliAppTemplate implements PaymentTemplate {
         AlipayTradeQueryRequest request = new AlipayTradeQueryRequest();
 
         JSONObject bizContent = new JSONObject();
-        bizContent.put("out_trade_no", payment.getId());
+        bizContent.put("out_trade_no", payment.getPaymentNo());
+        bizContent.put("trade_no", payment.getId());
+
         request.setBizContent(bizContent.toString());
         try {
             AlipayTradeQueryResponse response = alipayClientApp.execute(request);