查看优惠商品修改

src/main/java/com/caimei365/user/UserApplication.java

@@ -3,7 +3,7 @@ package com.caimei365.user;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.cloud.openfeign.EnableFeignClients;
+
 
 /**
  * `@EnableEurekaClient`: 声明一个Eureka客户端，只能注册到Eureka Server
@@ -15,7 +15,6 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 
 @EnableDiscoveryClient
 @SpringBootApplication
-@EnableFeignClients(basePackages = {"com.caimei365.user.feign"})
 public class UserApplication {
 
     public static void main(String[] args) {

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

@@ -248,12 +248,6 @@ public class RegisterApi {
         return registerService.temporaryData(id);
     }
 
-//    @ApiOperation("现金开通超级会员")
-//    @GetMapping("super/money")
-//    public ResponseJson superVipUpgrade(SuperVipDto superVipDto, @RequestHeader HttpHeaders headers) {
-//        return registerService.superVipUpgrade(superVipDto, headers);
-//    }
-
     @ApiOperation("采美豆开通超级会员")
     @GetMapping("/super/beans")
     public ResponseJson superVipUpByBeans(Integer userId,Integer packageId, @RequestHeader HttpHeaders headers) {

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

@@ -453,21 +453,14 @@ public class BaseServiceImpl implements BaseService {
      * @return
      */
     @Override
-    public ResponseJson<Map<String, Object>> findVipHistory(Integer userId, Integer pageNum, Integer pageSize) {
+    public ResponseJson findVipHistory(Integer userId, Integer pageNum, Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);
         List<VipPayHistoryPo> vipHistory = vipMapper.findVipHistory(userId);
         PageInfo<VipPayHistoryPo> historyPageInfo = new PageInfo<>(vipHistory);
-        HashMap<String, Object> map = new HashMap<>(2);
-        //购买记录存入map
-        map.put("history", historyPageInfo);
-        //查过期时间
-        SuperVipDto vipEnd = findEnd(userId);
-        map.put("vip", vipEnd);
-        return ResponseJson.success(map);
+        return ResponseJson.success(historyPageInfo);
     }
 
 
-
     @Override
     public ResponseJson<Map<String, Object>> superCenter(Integer userId, Integer source) {
         //1.封装vipDto看超级会员是否过期,0未开通，-1过期，1未过期

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

@@ -950,15 +950,6 @@ public class RegisterServiceImpl implements RegisterService {
         return ResponseJson.success(clubTemporary);
     }
 
-//    /**
-//     * 现金买超级会员
-//     */
-//    @Override
-//    public ResponseJson superVipUpgrade(SuperVipDto superVipDto, HttpHeaders headers) {
-//
-//
-//        return null;
-//    }
 
     /**
      * 采美豆买超级会员
@@ -978,14 +969,14 @@ public class RegisterServiceImpl implements RegisterService {
                 beanPay(userId, packageId, null, endFlag.getVipFlag());
                 return ResponseJson.success("支付采美豆购买成功");
             }
-            return ResponseJson.error("用户采美豆不足，请确认后再支付", null);
+            return ResponseJson.error("用户采美豆不足", null);
         } else {
             if (Double.valueOf(userBeans) >= (price * 100)) {
                 //续费生效时间不变，原到期时间+套餐时间
                 beanPay(userId, packageId, endFlag.getEndTime(), endFlag.getVipFlag());
                 return ResponseJson.success("支付采美豆购买成功");
             }
-            return ResponseJson.error("用户采美豆不足，请确认后再支付", null);
+            return ResponseJson.error("用户采美豆不足", null);
         }
     }