Merge branch 'master' of https://gogs.seec.seecoder.cn/DingXiaoYu/BlueWhale

src/main/java/com/seecoder/BlueWhale/serviceImpl/CouponServiceImpl.java

@@ -8,6 +8,7 @@ import com.seecoder.BlueWhale.po.CouponGroup;
 import com.seecoder.BlueWhale.po.User;
 import com.seecoder.BlueWhale.repository.CouponGroupRepository;
 import com.seecoder.BlueWhale.repository.CouponRepository;
+import com.seecoder.BlueWhale.repository.StoreRepository;
 import com.seecoder.BlueWhale.service.CouponService;
 import com.seecoder.BlueWhale.util.SecurityUtil;
 import com.seecoder.BlueWhale.vo.CouponGroupVO;
@@ -31,6 +32,9 @@ public class CouponServiceImpl implements CouponService {
     @Autowired
     SecurityUtil securityUtil;
 
+    @Autowired
+    StoreRepository storeRepository;
+
     @Override
     public Boolean createCouponGroup(CouponGroupVO couponGroupVO) {
         if (couponGroupVO.getType()== CouponTypeEnum.FULL_REDUCTION){
@@ -58,15 +62,15 @@ public class CouponServiceImpl implements CouponService {
                         .collect(Collectors.toSet());
                 return couponGroups.stream()
                         .filter(x->!received.contains(x.getId()))
-                        .map(CouponGroup::toVO)
+                        .map(x->wrapWithStoreId(x.toVO()))
                         .collect(Collectors.toList());
             case STAFF:
                 return couponGroupRepository.findByStoreId(user.getStoreId()).stream()
-                        .map(CouponGroup::toVO).collect(Collectors.toList());
+                        .map(x->wrapWithStoreId(x.toVO())).collect(Collectors.toList());
             case MANAGER:
             case CEO:
                 return couponGroupRepository.findAll().stream()
-                        .map(CouponGroup::toVO).collect(Collectors.toList());
+                        .map(x->wrapWithStoreId(x.toVO())).collect(Collectors.toList());
         }
         return null;
     }
@@ -115,7 +119,15 @@ public class CouponServiceImpl implements CouponService {
         couponVO.setType(couponGroup.getType());
         couponVO.setMinus(couponGroup.getMinus());
         couponVO.setStoreId(couponGroup.getStoreId());
+        couponVO.setStoreName(couponVO.getStoreId()==0?"商场发放":
+                storeRepository.findById(couponGroup.getStoreId()).get().getName());
         return couponVO;
     }
 
+    private CouponGroupVO wrapWithStoreId(CouponGroupVO couponGroupVO){
+        couponGroupVO.setStoreName(couponGroupVO.getStoreId()==0?"商场发放":
+                storeRepository.findById(couponGroupVO.getStoreId()).get().getName());
+        return couponGroupVO;
+    }
+
 }

src/main/java/com/seecoder/BlueWhale/serviceImpl/OrderServiceImpl.java

@@ -59,18 +59,21 @@ public class OrderServiceImpl implements OrderService {
     @Override
     public List<OrderVO> getAllOrders() {
         User user=securityUtil.getCurrentUser();
-        List<Order> orders;
-        if (user.getRole()==RoleEnum.CUSTOMER){
-            orders = orderRepository.findByUserId(user.getId());
-        }else {
-            if (user.getRole()==RoleEnum.STAFF) {
+        List<Order> orders = null;
+        switch (user.getRole()){
+            case CUSTOMER:
+                orders = orderRepository.findByUserId(user.getId());
+                break;
+            case STAFF:
                 Integer storeId=user.getStoreId();
                 orders = orderRepository.findAll().stream()
                         .filter(x-> storeId.equals(productRepository.findById(x.getProductId()).get().getStoreId()))
                         .collect(Collectors.toList());
-            }else {
-                orders = new ArrayList<>(orderRepository.findAll());
-            }
+                break;
+            case MANAGER:
+            case CEO:
+                orders = orderRepository.findAll();
+                break;
         }
         return orders.stream().map(x->wrapWithProductId(x.toVO())).collect(Collectors.toList());
     }

src/main/java/com/seecoder/BlueWhale/vo/CouponGroupVO.java

@@ -23,6 +23,8 @@ public class CouponGroupVO {
 
     private Integer rest;
 
+    private String storeName;
+
     public CouponGroup toPO(){
         CouponGroup couponGroup=new CouponGroup();
         couponGroup.setId(this.id);

src/main/java/com/seecoder/BlueWhale/vo/CouponVO.java

@@ -26,4 +26,6 @@ public class CouponVO {
 
     private Integer userId;
 
+    private String storeName;
+
 }