bugfix

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

@@ -159,7 +159,7 @@ public class LoginServiceImpl implements LoginService {
      * @param headers       HttpHeaders
      */
     @Override
-    public ResponseJson<UserLoginVo> appletsAuthorization(String code, String encryptedData, String iv, HttpHeaders headers) throws ParseException {
+    public ResponseJson<UserLoginVo> appletsAuthorization(String code, String encryptedData, String iv, HttpHeaders headers){
         if (StringUtils.isBlank(code)) {
             return ResponseJson.error("没有获取到微信授权code", null);
         }

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

@@ -194,7 +194,7 @@ public class RegisterServiceImpl implements RegisterService {
           保存用户状态
          */
         List<UserPo> userPos = registerMapper.selUser(current);
-        for(UserPo userInfo: userPos) {
+        for (UserPo userInfo : userPos) {
             registerMapper.insertOrgan(userInfo.getUserId());
         }
         /*
@@ -227,7 +227,7 @@ public class RegisterServiceImpl implements RegisterService {
         user.setClubId(club.getClubId());
         registerMapper.updateUserClubId(user.getUserId(), club.getClubId());
         //推送信息中心-账户通知
-        MessageCenter messageCenter=new MessageCenter();
+        MessageCenter messageCenter = new MessageCenter();
         messageCenter.setShopId(null);
         messageCenter.setClubId(club.getClubId());
         messageCenter.setUserType(1);
@@ -239,7 +239,7 @@ public class RegisterServiceImpl implements RegisterService {
 
         //    绑定微信，成为机构运营人员
         if (StringUtils.isNotEmpty(clubRegisterDto.getNickName())) {
-            MessageCenter messageCente=new MessageCenter();
+            MessageCenter messageCente = new MessageCenter();
             messageCente.setShopId(null);
             messageCente.setClubId(club.getClubId());
             messageCente.setUserType(1);
@@ -1011,13 +1011,11 @@ public class RegisterServiceImpl implements RegisterService {
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public ResponseJson superVipUpByBeans(Integer userId, Integer packageId, HttpHeaders headers){
+    public ResponseJson superVipUpByBeans(Integer userId, Integer packageId, HttpHeaders headers) {
         Integer clubId = messageCenterMapper.clubIdCule(userId);
         SuperVipDto endFlag = findEnd(userId);
         Integer userBeans = vipMapper.findUserBeans(userId);
         VipPackage pac = vipMapper.findUserPackage(packageId);
-
-
         //过期和没买过都是生效时间重置，到期时间=现在+套餐时间
         if (endFlag.getVipFlag() == 0 || endFlag.getVipFlag() == -1) {
             //1.查用户采美豆，够就用采美豆下单，不够就返回信息
@@ -1086,27 +1084,22 @@ public class RegisterServiceImpl implements RegisterService {
                     messageCenter.setContent(pac.getDuration() + "个月");
                     messageCenter.setTime(current);
                     messageCenterMapper.addMessageCenter(messageCenter);
-
                     try {
                         log.info("***********会员续费微信公众号推送************");
                         String accessToken = weChatService.getAccessToken();
-                        String unionId=messageCenterMapper.UnionIdList(userId);
+                        String unionId = messageCenterMapper.UnionIdList(userId);
                         String openid = messageCenterMapper.getOpenidListByPermission(unionId);
-                        String date=current;
+                        String date = current;
                         String remarkText = "如在使用中有任何疑问，请在小程序内联系在线客服";
                         // 跳转到【小程序付款-选择支付方式页面】
                         String pagePath = "/pages/user/member/member";
                         // sendTemplateMsg(openid, 标题, 金额, 收款日期, 备注, 跳转链接
                         log.error("获取openid>>>>>" + openid);
-                        weChatService.sendTemplateMsg(accessToken, openid,date,remarkText, pagePath);
+                        weChatService.sendTemplateMsg(accessToken, openid, date, remarkText, pagePath);
                     } catch (Exception e) {
                         log.error("【会员充值微信通知】获取微信公众号access_token异常！", e);
                     }
-
-
-
                 }
-
                 return ResponseJson.success("支付采美豆购买成功");
             }
             return ResponseJson.error("用户采美豆不足", null);
@@ -1135,14 +1128,10 @@ public class RegisterServiceImpl implements RegisterService {
         }
         cal.setTime(beginTime);
         cal.add(Calendar.MONTH, pac.getDuration());
-
-
         // 查询未支付的当前超级会员套餐购买记录
         Integer dbHistoryId = vipMapper.getVipHistoryId(userId, packageId);
         //userId, packageId, beginTime, endTime, payStatus, payWay, payType, price, userBeans, payTime
         VipPayHistoryPo payHistory = new VipPayHistoryPo();
-
-
         payHistory.setUserBeans(0d);
         payHistory.setUserId(userId);
         payHistory.setPackageId(packageId);
@@ -1153,19 +1142,6 @@ public class RegisterServiceImpl implements RegisterService {
         // 线上支付
         payHistory.setPayWay(1);
         payHistory.setPrice(pac.getPrice());
-
-        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        String current = dateFormat.format(new Date());
-        //1.日期格式
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
-        String endTime = sdf.format(payHistory.getEndTime());
-        //2.会员有效期(月)
-        Long s = (payHistory.getEndTime().getTime() - payHistory.getBeginTime().getTime()) / 24 / 60 / 60 / 30 / 1000;
-        //2.会员有效期(日)
-        Long t = (payHistory.getEndTime().getTime() - payHistory.getBeginTime().getTime()) / 24 / 60 / 60 / 1000;
-        Integer count =messageCenterMapper.getVipHistoryCount(userId);
-
-
         if (null != dbHistoryId && dbHistoryId > 0) {
             payHistory.setId(dbHistoryId);
             // 更新未支付的当前超级会员购买记录
@@ -1174,21 +1150,17 @@ public class RegisterServiceImpl implements RegisterService {
             // 新增超级会员购买记录
             vipMapper.addPayHistory(payHistory);
         }
-
         if (payHistory.getId() > 0) {
-
             return ResponseJson.success(payHistory.getId());
         }
         return ResponseJson.error("支付开通超级会员异常！", null);
     }
 
 
-
-
     /**
      * 根据userId查是否过期，返回dto对象，flag=0未买过，-1过期，1有效，endTime过期时间
      */
-    private SuperVipDto findEnd(Integer userId){
+    private SuperVipDto findEnd(Integer userId) {
         SuperVipPo superVip = vipMapper.findSuperVip(userId);
         SuperVipDto superVipDto = new SuperVipDto();
         Integer clubId = messageCenterMapper.clubIdCule(userId);
@@ -1202,12 +1174,8 @@ public class RegisterServiceImpl implements RegisterService {
             } else {
                 superVipDto.setVipFlag(1);
                 superVipDto.setEndTime(endTime.getEndTime());
-
             }
-
-
         }
-
         return superVipDto;
     }