'合并'

src/main/java/com/futu/course/cupons/dto/CouponDto.java

@@ -12,7 +12,7 @@ import java.math.BigDecimal;
 @NoArgsConstructor
 public class CouponDto {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private  Long couponId;
+    private Long couponId;
 
 
 

src/main/java/com/futu/course/cupons/service/impl/CouponServiceImpl.java

@@ -53,18 +53,18 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon>
         if (objects == null){
             return R.failed("没有优惠券");
         }
-        System.err.println(objects);
         Course course = courseMapper.selectById(primary.getCouponId());
         List<Coupon> list=new ArrayList<>();
+
         for (Long i:objects){
             Date date1=new Date();
             list.add(this.baseMapper.selectOne(new QueryWrapper<Coupon>().eq("id",i).ge("condition_amount",course.getPrice()).ge("start_time",date1)));
             System.err.println(list);
         }
-        if (list==null){
-            return R.failed("没有可用的优惠券");
+        if (list!=null){
+            return R.ok(list);
         }
-        return R.ok(list);
+        return R.failed("没有可用的优惠券");
     }
 
 

src/main/java/com/futu/course/pay/config/WxConfigV2.java

@@ -5,7 +5,7 @@ import lombok.Data;
 @Data
 public class WxConfigV2 {
     //    private String appId="wxc8a6a80ca6808238";
-    private String appId="wx28259a006c4eb246";
+    private String appId="wxc8a6a80ca6808238";
     private String mchId="1628726718";
 //    private String mchId="1516562401";