代码优化

src/main/java/com/chelvc/cloud/maintain/controller/CouponController.java

@@ -1,5 +1,9 @@
 package com.chelvc.cloud.maintain.controller;
 
+import java.util.List;
+import javax.validation.Valid;
+import javax.validation.constraints.Min;
+
 import com.chelvc.cloud.maintain.copier.CouponCopier;
 import com.chelvc.cloud.maintain.vo.CouponVO;
 import com.chelvc.cloud.vehicle.api.constant.CouponClaimType;
@@ -21,11 +25,6 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
-import javax.validation.constraints.Min;
-import java.util.List;
-import java.util.stream.Collectors;
-
 /**
  * 优惠券接口
  *
@@ -70,7 +69,7 @@ public class CouponController {
      */
     @GetMapping("/coupon/{id}")
     public CouponVO getCoupon(@PathVariable("id") @Min(value = 1, message = "优惠券主键不能小于1") Long id) {
-        return this.convert(this.couponService.getCoupon(id));
+        return CouponCopier.INSTANCE.copying(this.couponService.getCoupon(id));
     }
 
     /**
@@ -88,15 +87,14 @@ public class CouponController {
         }
 
         // 构建优惠券信息
-        List<CouponVO> coupons = records.stream().map(this::convert).collect(Collectors.toList());
-        return pagination.convert(coupons);
+        return pagination.convert(CouponCopier.INSTANCE::copying);
     }
 
     /**
      * 根据商家ID查询优惠券分页
      *
      * @param merchantId 商家ID
-     * @param param 查询参数
+     * @param param      查询参数
      * @return 优惠券分页信息
      */
     @GetMapping("/coupon/{merchantId}/paging")
@@ -109,8 +107,7 @@ public class CouponController {
         }
 
         // 构建优惠券信息
-        List<CouponVO> coupons = records.stream().map(this::convert).collect(Collectors.toList());
-        return pagination.convert(coupons);
+        return pagination.convert(CouponCopier.INSTANCE::copying);
     }
 
     /**
@@ -129,20 +126,10 @@ public class CouponController {
     /**
      * 删除优惠券
      *
-     * @param id    优惠券主键
+     * @param id 优惠券主键
      */
     @DeleteMapping("/coupon/{id}")
     public void deleteCoupon(@PathVariable("id") @Min(value = 1, message = "优惠券主键不能小于1") Long id) {
 
     }
-
-    /**
-     * 转换优惠券
-     *
-     * @param coupon 优惠券DTO
-     * @return 优惠券VO
-     */
-    private CouponVO convert(CouponDTO coupon) {
-        return CouponCopier.INSTANCE.copying(coupon);
-    }
 }

src/main/java/com/chelvc/cloud/maintain/controller/UserCouponController.java

@@ -1,10 +1,14 @@
 package com.chelvc.cloud.maintain.controller;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+import javax.validation.Valid;
+import javax.validation.constraints.Min;
+
 import com.chelvc.cloud.maintain.copier.UserCouponCopier;
-import com.chelvc.cloud.maintain.vo.CouponVO;
 import com.chelvc.cloud.maintain.vo.UserCouponVO;
 import com.chelvc.cloud.vehicle.api.dto.UserCouponDTO;
-import com.chelvc.cloud.vehicle.api.param.CouponPagingParam;
 import com.chelvc.cloud.vehicle.api.param.UserCouponPagingParam;
 import com.chelvc.cloud.vehicle.api.param.UserCouponQueryParam;
 import com.chelvc.cloud.vehicle.api.service.UserCouponService;
@@ -18,12 +22,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
-import javax.validation.constraints.Min;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
 /**
  * 优惠券领取记录接口
  *
@@ -50,7 +48,6 @@ public class UserCouponController {
 
     /**
      * 自动领取优惠券
-     *
      */
     @PostMapping("/usercoupon/autoclaim")
     public void autoClaimCoupon() {
@@ -101,8 +98,7 @@ public class UserCouponController {
      */
     @GetMapping("/usercoupon/{id}")
     public UserCouponVO getUserCoupon(@PathVariable("id") @Min(value = 1, message = "优惠券领取记录主键不能小于1") Long id) {
-        UserCouponVO couponGain = this.convert(this.userCouponService.getUserCoupon(id));
-        return couponGain;
+        return UserCouponCopier.INSTANCE.copying(this.userCouponService.getUserCoupon(id));
     }
 
     /**
@@ -120,17 +116,6 @@ public class UserCouponController {
         }
 
         // 构建优惠券领取记录信息
-        List<UserCouponVO> couponGains = records.stream().map(this::convert).collect(Collectors.toList());
-        return pagination.convert(couponGains);
-    }
-
-    /**
-     * 转换优惠券领取记录
-     *
-     * @param userCoupon 优惠券领取记录DTO
-     * @return 优惠券领取记录VO
-     */
-    private UserCouponVO convert(UserCouponDTO userCoupon) {
-        return UserCouponCopier.INSTANCE.copying(userCoupon);
+        return pagination.convert(UserCouponCopier.INSTANCE::copying);
     }
 }