Merge remote-tracking branch 'origin/master'

src/main/java/com/example/afrishop_v3/controllers/ActivityController.java

+package com.example.afrishop_v3.controllers;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Auther: wudepeng
+ * @Date: 2020/11/30
+ * @Description:
+ */
+@RestController
+public class ActivityController {
+}

src/main/java/com/example/afrishop_v3/controllers/CartController.java

@@ -137,19 +137,19 @@ public class CartController extends Controller {
         return new Result();
     }
 
-    @GetMapping("/changeCartStatus/{cartId}/{status}")
-    public Result changeCartStatus(@PathVariable("cartId") String cartId,
+    @PutMapping("/changeCartStatus/{status}")
+    public Result changeCartStatus(@RequestBody String[] cartIds,
                                    @PathVariable("status") Integer status) {
-        if (StringUtils.isBlank(cartId) || status == null) {
+        if (cartIds == null || status == null) {
             return new Result(ResultCodeEnum.SERVICE_ERROR.getCode(),
                     "The parameter cannot be null");
         }
-        Optional<TbCfCartRecordR> byId = repository.findById(cartId);
-        if (byId.isPresent()) {
-            TbCfCartRecordR cart = byId.get();
+        List<TbCfCartRecordR> cartList = repository.findAllByCartRecordIdIn(cartIds);
+        cartList.forEach(cart -> {
             cart.setCheckFlag(status);
             repository.save(cart);
-        }
+        });
+
         return new Result();
     }
 

src/main/java/com/example/afrishop_v3/controllers/CouponController.java

@@ -66,28 +66,28 @@ public class CouponController {
         return new Result(ResultCodeEnum.ERROR.getCode(), "The coupon has been snapped up");
     }
 
-    /**
-     * 查询用户未使用的优惠券,可用的排在顶部
-     */
-    @GetMapping("/selectCoupon")
-    public Result queryUserAvailableCoupons(@RequestParam("orderPrice") BigDecimal orderPrice) {
-        Map<String, Object> couponMap = new HashMap<>();
-        //可使用的优惠券
-        LinkedList<TbCfToicoupon> availableCoupon = new LinkedList();
-        //不可使用的优惠券
-        LinkedList<TbCfToicoupon> unAvailableCoupon = new LinkedList();
-        List<TbCfToicoupon> couponList = repository.queryUserAvailableCoupon(user.userId());
-        couponList.forEach(coupon -> {
-            boolean available = orderPrice.compareTo(coupon.withAmount()) >= 0;
-            if (available) {
-                availableCoupon.add(coupon);
-            } else {
-                unAvailableCoupon.add(coupon);
-            }
-        });
-        couponMap.put("availableCoupon", availableCoupon);
-        couponMap.put("unAvailableCoupon", unAvailableCoupon);
-
-        return new Result(couponMap);
-    }
+//    /**
+//     * 查询用户未使用的优惠券,可用的排在顶部
+//     */
+//    @GetMapping("/selectCoupon")
+//    public Result queryUserAvailableCoupons(@RequestParam("orderPrice") BigDecimal orderPrice) {
+//        Map<String, Object> couponMap = new HashMap<>();
+//        //可使用的优惠券
+//        LinkedList<TbCfToicoupon> availableCoupon = new LinkedList();
+//        //不可使用的优惠券
+//        LinkedList<TbCfToicoupon> unAvailableCoupon = new LinkedList();
+//        List<TbCfToicoupon> couponList = repository.queryUserAvailableCoupon(user.userId());
+//        couponList.forEach(coupon -> {
+//            boolean available = orderPrice.compareTo(coupon.withAmount()) >= 0;
+//            if (available) {
+//                availableCoupon.add(coupon);
+//            } else {
+//                unAvailableCoupon.add(coupon);
+//            }
+//        });
+//        couponMap.put("availableCoupon", availableCoupon);
+//        couponMap.put("unAvailableCoupon", unAvailableCoupon);
+//
+//        return new Result(couponMap);
+//    }
 }

src/main/java/com/example/afrishop_v3/models/TbCfOrder.java

@@ -155,7 +155,18 @@ public class TbCfOrder {
      */
     private String remarkInfo;
 
-//    @JsonIgnore
+    @Transient
+    private Map<String,Object> couponMap;
+
+    public Map<String, Object> getCouponMap() {
+        return couponMap;
+    }
+
+    public void setCouponMap(Map<String, Object> couponMap) {
+        this.couponMap = couponMap;
+    }
+
+    //    @JsonIgnore
 //    @JoinColumn(columnDefinition = "user_id",name = "user_id")
 //    @ManyToOne(fetch = FetchType.LAZY)
 //    private TbCfUserInfo userInfo;

src/main/java/com/example/afrishop_v3/repository/TbCfCartRecordRRepository.java

@@ -23,6 +23,8 @@ public interface TbCfCartRecordRRepository extends PagingAndSortingRepository<Tb
     List<TbCfCartRecordR> findAllByCartRecordIdIn(String[] ids);
 
 
+    @Modifying
+    @Transactional
     void deleteAllByCartRecordIdIn(String[] ids);
 
     @Modifying