超级会员

src/main/java/com/caimei365/user/controller/SellerApi.java

@@ -77,23 +77,24 @@ public class SellerApi {
     /**
      * 协销机构列表
      * 原spi的 /seller/club/list
-     * @param serviceProviderId 协销Id
+     *
+     * @param spId 协销Id
      * @param status            机构状态
      * @param name              机构名字关键字（搜索用）
      * @return
      */
     @ApiOperation("协销机构列表")
     @GetMapping("/club/list")
-    public ResponseJson getClubList(@RequestParam("spId") Integer serviceProviderId,
-                                 @RequestParam("status") Integer status,
-                                 @RequestParam("name") String name,
-                                 @RequestParam("userIdentity") Integer userIdentity,
-                                 @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
-                                 @RequestParam(value = "pageSize", defaultValue = "10") int pageSize) {
-        if (null == serviceProviderId || null == status) {
-            return ResponseJson.error("参数不全！");
+    public ResponseJson getClubList(Integer spId,
+                                    Integer status,
+                                    String name,
+                                    Integer userIdentity,
+                                    @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+                                    @RequestParam(value = "pageSize", defaultValue = "10") int pageSize) {
+        if (null == spId || null == status) {
+            return ResponseJson.error("spId 或 status 参数不全！");
         }
-        return sellerService.getClubList(serviceProviderId, status, name, userIdentity, pageNum, pageSize);
+        return sellerService.getClubList(spId, status, name, userIdentity, pageNum, pageSize);
     }
 
 }

src/main/java/com/caimei365/user/mapper/SellerMapper.java

@@ -57,7 +57,7 @@ public interface SellerMapper {
      */
     void deleteTemporaryClub(Integer id);
 
-    List<ClubVo> findClubs(@Param("serviceProviderId") Integer serviceProviderId, @Param("status") Integer status, @Param("name") String name, @Param("userIdentity") Integer userIdentity);
+    List<ClubVo> findClubs(@Param("serviceProviderId") Integer serviceProviderId, @Param("status") Integer status, @Param("name") String name, Integer userIdentity);
 
     Integer findOrderNum(ClubVo club);
 }

src/main/java/com/caimei365/user/mapper/SuperVipMapper.java

@@ -26,14 +26,14 @@ public interface SuperVipMapper {
      * @param useTime 当月月份
      * @return
      */
-    List<CouponVo> findVipCoupon(Integer userId, Integer useTime);
+    List<CouponVo> findVipCoupon(Integer userId, String useTime);
 
     /**
      * 查当月优惠券是否被领取
      * @param userId
      * @return
      */
-    List<Integer> findCouponGet(@Param("userId") Integer userId,Integer useTime);
+    List<Integer> findCouponGet(@Param("userId") Integer userId,String useTime);
     /**
      * 查vip信息
      *

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

@@ -6,6 +6,8 @@ import com.caimei365.user.model.vo.ClubTemporaryVo;
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.bind.annotation.RequestHeader;
 
+import java.text.ParseException;
+
 /**
  * Description
  *
@@ -145,6 +147,14 @@ public interface RegisterService {
     ResponseJson<ClubTemporaryVo> temporaryData(Integer id);
 
 
+    /**
+     * 现金买超级会员回调
+     * @param userId
+     * @param packageId
+     * @return
+     */
+    ResponseJson superVipByMoney(Integer userId,Integer packageId) throws ParseException;
+
     /**
      * 采美豆购买超级会员
      * @param

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

@@ -469,9 +469,9 @@ public class BaseServiceImpl implements BaseService {
         Map<String, Object> map = new HashMap(3);
         map.put("vip", vipEnd);
         //2.查当月vip优惠卷
-        Integer useTime = Calendar.getInstance().get(Calendar.MONTH);
-        List<CouponVo> vipCoupon = vipMapper.findVipCoupon(userId, useTime + 1);
-        List<Integer> couponGet = vipMapper.findCouponGet(userId, useTime + 1);
+        String nowMonth = DateUtil.getNowMonth();
+        List<CouponVo> vipCoupon = vipMapper.findVipCoupon(userId, nowMonth);
+        List<Integer> couponGet = vipMapper.findCouponGet(userId, nowMonth);
         vipCoupon.forEach(couponVo -> couponVo.setGetFlag(couponGet.contains(couponVo.getCouponId()) ? 1 : 0));
         map.put("coupon", vipCoupon);
         //todo 3.查优惠商品
@@ -481,7 +481,7 @@ public class BaseServiceImpl implements BaseService {
 
     @Override
     public ResponseJson findPackage() {
-        List<VipPackage> pac=vipMapper.findPackage();
+        List<VipPackage> pac = vipMapper.findPackage();
         return ResponseJson.success(pac);
     }
 

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

@@ -23,6 +23,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
@@ -950,7 +951,46 @@ public class RegisterServiceImpl implements RegisterService {
         return ResponseJson.success(clubTemporary);
     }
 
+    /**
+     * 现金买超级会员回调
+     * @param userId
+     * @param packageId
+     * @return
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public ResponseJson superVipByMoney(Integer userId,Integer packageId) throws ParseException {
+        SuperVipDto endFlag = findEnd(userId);
+        VipPackage pac = vipMapper.findUserPackage(packageId);
+        Calendar cal = Calendar.getInstance();
+        SuperVipPo superVip = new SuperVipPo();
+        //flag=0未买过，-1过期，1有效，endTime过期时间
+        if (endFlag.getVipFlag() == 0) {
+            //svipuser表改生效时间，过期时间
+            Integer duration = pac.getDuration();
+            String today = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
+            today += " 00:00:00";
+            today= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(today);
+            Date parse = new SimpleDateFormat("yyyy-MM-dd").parse(today);
+            cal.setTime(parse);
+            Date beginTime = cal.getTime();
+            superVip.setBeginTime(beginTime);
+            superVip.setUpdateTime(beginTime);
+            cal.add(Calendar.MONTH,duration);
+            superVip.setEndTime(cal.getTime());
+            superVip.setUserId(userId);
+            superVip.setDelFlag(0);
+            vipMapper.addVip(superVip);
+            //sviphistory表加入现金买会员历史
 
+            //cm_discern_receipt加入收款记录
+        }else if(endFlag.getVipFlag() == -1){
+
+        }else if(endFlag.getVipFlag() == 1){
+
+        }
+        return null;
+    }
     /**
      * 采美豆买超级会员
      */

src/main/java/com/caimei365/user/utils/DateUtil.java

@@ -0,0 +1,60 @@
+package com.caimei365.user.utils;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
+public class DateUtil {
+    private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
+    private static Calendar calendar = Calendar.getInstance();
+
+    /*
+    输入日期字符串比如201703，返回当月第一天的Date
+    */
+    public static Date getMinDay(String month) {
+        try {
+            Date nowDate = sdf.parse(month);
+            calendar = Calendar.getInstance();
+            calendar.setTime(nowDate);
+            calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMinimum(Calendar.DAY_OF_MONTH));
+            return calendar.getTime();
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /*
+    输入日期字符串，返回月底0点
+    */
+    public static Date getMaxDay(String month) {
+        try {
+            Date nowDate = sdf.parse(month);
+            calendar = Calendar.getInstance();
+            calendar.setTime(nowDate);
+            calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
+            return calendar.getTime();
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 返回现在时间yyyy-mm格式
+     * @return
+     */
+    public static String getNowMonth(){
+        Date date = new Date();
+        String format = new SimpleDateFormat("yyyy-MM").format(date);
+        return format;
+    }
+//    public static void main(String[] args) throws ParseException {
+//        String month = "2020-02";
+//        System.out.println(getMinDateMonth(month));
+//        System.out.println(getMaxDateMonth(month));
+//    }
+
+
+}

src/main/resources/mapper/SuperVipMapper.xml

@@ -121,10 +121,12 @@
         INNER JOIN cm_svip_coupon cs ON cs.couponId = cc.id
         WHERE cc.delFlag = 0
         AND cc.status != 2
+        AND cs.delFlag = 0
+        AND cs.status = 1
         <if test="useTime != null and useTime != ''">
             AND cs.useTime=#{useTime}
         </if>
-        ORDER BY cs.created_time DESC
+        ORDER BY cc.startDate DESC
     </select>
 
     <select id="findCouponGet" resultType="java.lang.Integer">
@@ -141,7 +143,7 @@
         where userID = #{userId}
     </select>
 
-    <select id="findPackage" resultType="java.util.List">
+    <select id="findPackage" resultType="com.caimei365.user.model.po.VipPackage">
         select id, price, name, duration, proportion
         from cm_svip_package
         where delFlag = 0

src/test/java/com/caimei365/user/UserApplicationTests.java

@@ -10,6 +10,7 @@ import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
 import javax.annotation.Resource;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
@@ -22,19 +23,19 @@ class UserApplicationTests {
         boolean b = ValidateUtil.validateEmail("182126@qq.com");
         System.out.println(b);
     }*/
-    @Resource
-    private ToolsFeign feign;
-
-
-    @Test
-    void sms(){
-        String mobile = "15827317748";
-//        String randomCode = CodeUtil.generateCodeInt(6);
-//        String name ="dsfsd";
-        //AliyunSmsUtil.sendSms(mobile, 6, "{name:"+ mobile +",content:"+ randomCode +"}");
-//        AliyunSmsUtil.sendSms(mobile, 11, "{name:\""+ name +"\",code:" + randomCode + "}");
-        feign.getSendSms(mobile,"恭喜您成功开通采美平台超级会员，为期1个月，快戳采美网站链接www.caimei365.com或微信搜索“采美采购商城”小程序登录采美平台畅享会员特权吧。关注公众号“采美365网”可获取更多优惠和精彩资讯！");
-    }
+//    @Resource
+//    private ToolsFeign feign;
+//
+//
+//    @Test
+//    void sms(){
+//        String mobile = "15827317748";
+////        String randomCode = CodeUtil.generateCodeInt(6);
+////        String name ="dsfsd";
+//        //AliyunSmsUtil.sendSms(mobile, 6, "{name:"+ mobile +",content:"+ randomCode +"}");
+////        AliyunSmsUtil.sendSms(mobile, 11, "{name:\""+ name +"\",code:" + randomCode + "}");
+//        feign.getSendSms(mobile,"恭喜您成功开通采美平台超级会员，为期1个月，快戳采美网站链接www.caimei365.com或微信搜索“采美采购商城”小程序登录采美平台畅享会员特权吧。关注公众号“采美365网”可获取更多优惠和精彩资讯！");
+//    }
 //    @Test
 //    public static void main(String[] args) {
 //        Calendar cal = Calendar.getInstance();
@@ -56,5 +57,10 @@ class UserApplicationTests {
 //        vip.setEndTime(cal.getTime());
 //        mapper.updateVip(vip);
 //    }
-
+    @Test
+    void time() throws ParseException {
+        Date date = new Date();
+        String format = new SimpleDateFormat("yyyy-MM").format(date);
+        System.out.println(format);
+    }
 }