bugfix

src/main/java/com/caimei365/user/service/RegisterService.java

@@ -144,13 +144,6 @@ public interface RegisterService {
      */
     ResponseJson<ClubTemporaryVo> temporaryData(Integer id);
 
-//    /**
-//     * 购买超级会员
-//     * @param superVipDto
-//     * @param headers
-//     * @return
-//     */
-//    ResponseJson superVipUpgrade(SuperVipDto superVipDto, HttpHeaders headers);
 
     /**
      * 采美豆购买超级会员

src/main/java/com/caimei365/user/service/impl/RegisterServiceImpl.java

@@ -13,18 +13,15 @@ import com.caimei365.user.utils.AliyunSmsUtil;
 import com.caimei365.user.utils.CodeUtil;
 import com.caimei365.user.utils.Md5Util;
 import com.caimei365.user.utils.ValidateUtil;
-import io.netty.util.internal.MathUtil;
-import lombok.Data;
+
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestHeader;
 
 import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.text.ParseException;
+
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
@@ -1060,7 +1057,7 @@ public class RegisterServiceImpl implements RegisterService {
             superVip.setPackageId(packageId);
             superVip.setPrice(price);
             //重设生效起始时间
-            beginTime=new Date();
+            beginTime = new Date();
             superVip.setBeginTime(beginTime);
             //到期时间现在时间+套餐时间
             cal.setTime(beginTime);
@@ -1077,7 +1074,6 @@ public class RegisterServiceImpl implements RegisterService {
 
     /**
      * 修改超级会员记录表
-     *
      */
     private void setHistory(SuperVipPo vip) {
         VipPayHistoryPo payHistory = new VipPayHistoryPo();

src/main/resources/mapper/SuperVipMapper.xml

@@ -22,8 +22,8 @@
 
     <insert id="addUserBeansHistory">
         insert into user_beans_history
-            (num, type, pushStatus, addTime, beansType, userId)
-        values (#{userBeans}, 2, 0, now(), 14, #{userId})
+            (num, type, pushStatus, addTime, beansType, userId, delFlag)
+        values (#{userBeans}, 2, 0, now(), 14, #{userId}, 0)
     </insert>
 
     <update id="updateUserPermission">
@@ -129,11 +129,10 @@
     <select id="findCouponGet" resultType="java.lang.Integer">
         SELECT a.couponId
         FROM cm_coupon_club a
-        INNER JOIN cm_svip_coupon cs ON a.couponId = cs.couponId
+                 INNER JOIN cm_svip_coupon cs ON a.couponId = cs.couponId
         WHERE userId = #{userId}
-        AND useTime = #{useTime}
+          AND useTime = #{useTime}
     </select>
 
 
-
 </mapper>