update 支付宝小程序

jsowell-pile/src/main/java/com/jsowell/adapay/service/AdapayService.java

@@ -107,7 +107,6 @@ public class AdapayService {
         if (memberBasicInfo == null) {
             throw new BusinessException(ReturnCodeEnum.CODE_GET_OPEN_ID_BY_CODE_ERROR);
         }
-        String openId = memberBasicInfo.getOpenId();
 
         // 支付场景
         String type = dto.getType();
@@ -139,7 +138,7 @@ public class AdapayService {
         createAdaPaymentParam.setDescription(JSON.toJSONString(map));
         // 异步通知地址，url为http/https路径，服务器POST回调，URL 上请勿附带参数
         createAdaPaymentParam.setNotify_url(ADAPAY_CALLBACK_URL);
-        createAdaPaymentParam.setExpend(JSON.toJSONString(ImmutableMap.of("open_id", openId)));
+        createAdaPaymentParam.setExpend(JSON.toJSONString(ImmutableMap.of("open_id", memberBasicInfo.getOpenId())));
 
         // 延时分账
         if (StringUtils.isNotBlank(payMode)) {
@@ -197,7 +196,6 @@ public class AdapayService {
         if (memberBasicInfo == null) {
             throw new BusinessException(ReturnCodeEnum.CODE_GET_OPEN_ID_BY_CODE_ERROR);
         }
-        String openId = memberBasicInfo.getOpenId();
 
         // 支付场景
         String type = dto.getType();
@@ -230,7 +228,7 @@ public class AdapayService {
         createAdaPaymentParam.setNotify_url(ADAPAY_CALLBACK_URL);
 
         // alipay_lite参数  buyer_id String(100) Y 买家的支付宝用户 id
-        createAdaPaymentParam.setExpend(JSON.toJSONString(ImmutableMap.of("buyer_id", openId)));
+        createAdaPaymentParam.setExpend(JSON.toJSONString(ImmutableMap.of("buyer_id", memberBasicInfo.getBuyerId())));
 
         // 延时分账
         if (StringUtils.isNotBlank(payMode)) {

jsowell-pile/src/main/java/com/jsowell/alipay/service/AliAppletRemoteService.java

@@ -9,6 +9,7 @@ import com.alipay.api.AlipayConfig;
 import com.alipay.api.DefaultAlipayClient;
 import com.alipay.api.internal.util.AlipayEncrypt;
 import com.alipay.api.request.AlipaySystemOauthTokenRequest;
+import com.alipay.easysdk.base.oauth.Client;
 import com.alipay.easysdk.base.oauth.models.AlipaySystemOauthTokenResponse;
 import com.alipay.easysdk.factory.Factory;
 import com.jsowell.alipay.config.AliPayConfig;
@@ -43,7 +44,6 @@ public class AliAppletRemoteService {
 
         String accessToken = token.getAccessToken();
 
-        // Factory.Util.AES().decrypt();
         return "";
     }
 

jsowell-pile/src/main/java/com/jsowell/pile/domain/MemberBasicInfo.java

@@ -42,6 +42,11 @@ public class MemberBasicInfo extends BaseEntity {
 	 */
 	private String openId;
 
+	/**
+	 * 支付宝买家user_id
+	 */
+	private String buyerId;
+
 	/**
 	 * 车牌号
 	 */

jsowell-pile/src/main/java/com/jsowell/pile/dto/MemberRegisterAndLoginDTO.java

@@ -34,4 +34,9 @@ public class MemberRegisterAndLoginDTO extends BaseDTO{
 	 * 微信用户openId
 	 */
 	private String openId;
+
+	/**
+	 * 支付宝buyer_id
+	 */
+	private String buyerId;
 }

jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml

@@ -8,6 +8,7 @@
         <result property="id"    column="id"    />
         <result property="memberId" column="member_id"/>
         <result property="openId" column="open_id"/>
+        <result property="buyerId" column="buyer_id"/>
         <result property="licensePlateNumber" column="license_plate_number"/>
         <result property="nickName"    column="nick_name"    />
         <result property="logicCard"    column="logic_card"/>
@@ -32,7 +33,8 @@
 
     <sql id="Base_Column_List">
         <!--@mbg.generated PileBillingTemplate-->
-        id, member_id, open_id, license_plate_number, nick_name,logic_card, physics_card, status, avatar_url, mobile_number, merchant_id, remark,
+        id, member_id, open_id, buyer_id, license_plate_number, nick_name,logic_card, physics_card, status, avatar_url,
+        mobile_number, merchant_id, remark,
         create_time, create_by, update_time, update_by, del_flag
     </sql>
 
@@ -59,6 +61,7 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="memberId != null">member_id,</if>
             <if test="openId != null">open_id,</if>
+            <if test="buyerId != null">buyer_id,</if>
             <if test="licensePlateNumber != null">license_plate_number,</if>
             <if test="nickName != null">nick_name,</if>
             <if test="logicCard != null">logic_card,</if>
@@ -76,6 +79,7 @@
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="memberId != null">#{memberId},</if>
             <if test="openId != null">#{openId},</if>
+            <if test="buyerId != null">#{buyerId},</if>
             <if test="licensePlateNumber != null">#{licensePlateNumber},</if>
             <if test="nickName != null">#{nickName},</if>
             <if test="logicCard != null">#{logicCard},</if>
@@ -97,6 +101,7 @@
         <trim prefix="SET" suffixOverrides=",">
             <if test="memberId != null">member_id = #{memberId},</if>
             <if test="openId != null">open_id = #{openId},</if>
+            <if test="buyerId != null">buyer_id = #{buyerId},</if>
             <if test="licensePlateNumber != null">license_plate_number = #{licensePlateNumber},</if>
             <if test="nickName != null">nick_name = #{nickName},</if>
             <if test="logicCard != null">logic_card = #{logicCard},</if>