Merge remote-tracking branch 'origin/developerA' into developerE

src/main/java/com/caimei365/order/mapper/BaseMapper.java

@@ -232,4 +232,11 @@ public interface BaseMapper {
     String findType(String mbOrderId);
 
     Double getonlineMoney(Integer userId);
+
+    /**
+     * 查询认证通用户名称
+     * @param userId
+     * @return
+     */
+    AuthUserVo getAuthUser(Integer userId);
 }

src/main/java/com/caimei365/order/model/vo/AuthUserVo.java

@@ -0,0 +1,30 @@
+package com.caimei365.order.model.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * Description
+ *
+ * @author : Charles
+ * @date : 2021/8/6
+ */
+@Data
+public class AuthUserVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 用户id
+     */
+    private Integer authUserId;
+
+    /**
+     * 供应商名称
+     */
+    private String name;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+}

src/main/java/com/caimei365/order/service/impl/PayNonOrderServiceImpl.java

@@ -1294,6 +1294,7 @@ public class PayNonOrderServiceImpl implements PayNonOrderService {
             if (dbAuthVip.getEndTime().compareTo(beginTime) > 0) {
                 // 有效期内续费,用原结束时间作为开始时间来计算结束时间
                 beginTime = dbAuthVip.getEndTime();
+                authVip.setBeginTime(beginTime);
             } else {
                 // 过期重新续费
                 authVip.setBeginTime(beginTime);

src/main/java/com/caimei365/order/service/impl/PayOrderServiceImpl.java

@@ -410,7 +410,7 @@ public class PayOrderServiceImpl implements PayOrderService {
             orderPayLink.setUnpaidAmount(price);
         }else if (null != payLinkDto.getAuthVipRecordId()){
             // 获取认证通会员套餐记录
-            VipRecordBo record = payOrderMapper.getAuthVipRecord(payLinkDto.getVipRecordId());
+            VipRecordBo record = payOrderMapper.getAuthVipRecord(payLinkDto.getAuthVipRecordId());
             // 获取认证通会员套餐信息
             AuthVipPackagePo packagePo = payOrderMapper.getAuthVipPackageById(record.getPackageId());
             orderPayLink.setVipMonth(1 == packagePo.getUnit() ? packagePo.getDuration() : packagePo.getDuration() * 12);
@@ -455,14 +455,16 @@ public class PayOrderServiceImpl implements PayOrderService {
     @Override
     public ResponseJson<Map<String, Object>> linkPayData(String linkLogo) {
         OrderPayLinkVo orderPayLink = payOrderMapper.getPayLinkByLinkLogo(linkLogo);
-        if (null == orderPayLink || (null == orderPayLink.getOrderId() && null == orderPayLink.getVipRecordId())) {
+        if (null == orderPayLink || (null == orderPayLink.getOrderId() && null == orderPayLink.getVipRecordId() && null == orderPayLink.getAuthVipRecordId())) {
             // 已重新生成链接
             return ResponseJson.error("链接已更新,请重新获取", null);
         }
         // 链接状态,0成功
         int code = 0;
         String userName = "";
-        // 链接类型：1订单，2超级会员
+        // 认证通供应商信息
+        AuthUserVo authUser = null;
+        // 链接类型：1订单，2超级会员，3认证通会员
         int type = 0;
         // 订单支付记录
         List<DiscernReceiptVo> discernReceiptList = null;
@@ -474,12 +476,18 @@ public class PayOrderServiceImpl implements PayOrderService {
             discernReceiptList = orderCommonMapper.getDiscernReceipt(order.getOrderId(), order.getShopOrderIds());
             // 机构信息
             userName = baseMapper.getUserNameByUserId(order.getUserId());
-        } else {
+        } else if (null != orderPayLink.getVipRecordId()) {
             type = 2;
             // 获取会员套餐记录
             VipRecordBo record = payOrderMapper.getVipPackageRecord(orderPayLink.getVipRecordId());
             // 机构信息
             userName = baseMapper.getUserNameByUserId(record.getUserId());
+        } else {
+            type = 3;
+            // 获取会员套餐记录
+            VipRecordBo record = payOrderMapper.getAuthVipRecord(orderPayLink.getVipRecordId());
+            // 机构信息
+            authUser = baseMapper.getAuthUser(record.getUserId());
         }
         if (orderPayLink.getEffectiveTime().compareTo(new Date()) < 0) {
             //链接失效
@@ -514,6 +522,7 @@ public class PayOrderServiceImpl implements PayOrderService {
         map.put("type", type);
         map.put("orderPayLink", orderPayLink);
         map.put("userName", userName);
+        map.put("authUser", authUser);
         map.put("code", code);
         map.put("time", time);
         return ResponseJson.success(map);

src/main/resources/mapper/BaseMapper.xml

@@ -339,4 +339,10 @@
     <select id="getonlineMoney" resultType="java.lang.Double">
         select onlineMoney FROM USER WHERE userId = #{userId}
     </select>
+    <select id="getAuthUser" resultType="com.caimei365.order.model.vo.AuthUserVo">
+        select authUserId,name,mobile
+        from cm_brand_auth_user
+        where authUserId = #{userId}
+        LIMIT 1
+    </select>
 </mapper>

src/main/resources/mapper/PayOrderMapper.xml

@@ -197,6 +197,7 @@
             id,
             orderId,
             vipRecordId,
+            authVipRecordId,
             vipMonth,
             linkLogo,
             unpaidAmount,