支付宝增加支付宝订单号保存，权益领取增加用户是否退款判断

rights-client-controller/src/main/java/com/cyjd/rights/controller/AliPayController.java

@@ -464,6 +464,7 @@ public class AliPayController {
                 aliPayOrderEntity.setLinkName(aliPaySigningOrderEntity.getLinkName());
                 aliPayOrderEntity.setAliAccountName(aliPaySigningOrderEntity.getAliAccountName());
                 aliPayOrderEntity.setOrderName("惠点联合会员");
+                aliPayOrderEntity.setTradeNo(tradeNo);
                 if ("TRADE_SUCCESS".equals(tradeStatus) || "TRADE_FINISHED".equals(tradeStatus)) {
                     aliPayOrderEntity.setStatus(1);
                     aliPayOrderService.save(aliPayOrderEntity);

rights-entity/src/main/java/com/cyjd/rights/dto/AliPayInOrderDto.java

@@ -42,5 +42,6 @@ public class AliPayInOrderDto extends BasePageDto{
     @JsonFormat(shape = JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime endTime;
 
-
+    @ApiModelProperty(value = "支付宝交易号")
+    private String tradeNo;
 }

rights-entity/src/main/java/com/cyjd/rights/entity/AliPayOrderEntity.java

@@ -48,4 +48,6 @@ public class AliPayOrderEntity {
     private String linkName;
 
     private String aliAccountName; //账户名称（公司拼音首字母+编号）
+
+    private String tradeNo;  //支付宝交易号。支付宝交易凭证号。
 }

rights-entity/src/main/java/com/cyjd/rights/vo/AliPayOrderVo.java

@@ -37,5 +37,7 @@ public class AliPayOrderVo {
 
     private String linkName;
 
+    private String tradeNo;  //支付宝交易号。支付宝交易凭证号。
+
 
 }

rights-server/src/main/java/com/cyjd/rights/business/service/impl/AliPayServiceImpl.java

@@ -116,6 +116,7 @@ public class AliPayServiceImpl implements AliPayService {
             log.info("==========================");
             //System.out.println(request.getBizContent());
             response = alipayClient.certificateExecute(request);
+            //System.out.println(response.gets);
             if (response.isSuccess()) {
                 //log.info("用户内部系统签约号{}：查询周期扣款签约结果,调用成功", externalAgreementNo);
 

rights-server/src/main/java/com/cyjd/rights/business/service/impl/YunmeiServiceImpl.java

@@ -187,7 +187,7 @@ public class YunmeiServiceImpl implements YunmeiService {
         String reason = "暂无领取资格";
         //判断用户是否退订
         RefundOrderEntity refundOrder = refundOrderService.getOne(new QueryWrapper<RefundOrderEntity>().eq("mobile", mobile));
-        if (refundOrder==null){
+        if (refundOrder!=null){
             code = "10027";
             reason = "黑名单用户或已退款";
             resJSON.put("code", code);

rights-server/src/main/resources/mapper/business/AliPayOrderMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.cyjd.rights.business.mapper.AliPayOrderMapper">
     <select id="getPageOrder" resultType="com.cyjd.rights.vo.AliPayOrderVo">
         select
-        id,mobile,order_time,status,sign_code,price,other_order_id,ali_user_id,unsub_time,business_type,link_id
+        id,mobile,order_time,status,sign_code,price,other_order_id,ali_user_id,unsub_time,business_type,link_id,trade_no
         from tb_ali_pay_order
         <where>
             1=1
@@ -22,6 +22,9 @@
             <if test="mobile!=null and mobile!=''">
                 and mobile = #{mobile}
             </if>
+            <if test="tradeNo!=null and tradeNo!=''">
+                and trade_no = #{tradeNo}
+            </if>
             <if test="beginTime!=null">
                 and order_time &gt; #{beginTime}
             </if>

rights-server/src/main/resources/mapper/business/RefundOrderMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.cyjd.rights.business.mapper.AliPayOrderMapper">
+<mapper namespace="com.cyjd.rights.business.mapper.RefundOrderMapper">
     <select id="getPageOrder" resultType="com.cyjd.rights.entity.RefundOrderEntity">
         select
         id,mobile,refund_time,status,out_trade_no,out_request_no,refund_price,link_id