bug修复

src/main/java/com/usky/dxtop/controller/web/OrderController.java

@@ -177,8 +177,10 @@ public class OrderController extends BaseController {
      * @return
      */
     @GetMapping("/dateCollect")
-    public AjaxResult dateCollect(@RequestParam Integer type){
-        return AjaxResult.success(orderService.dateCollect(type));
+    public AjaxResult dateCollect(@RequestParam Integer type,
+                                  @RequestParam Date startTime,
+                                  @RequestParam Date endTime){
+        return AjaxResult.success(orderService.dateCollect(type,startTime,endTime));
     }
 
 }

src/main/java/com/usky/dxtop/service/OrderService.java

@@ -123,13 +123,13 @@ public interface OrderService extends IService<Order> {
      * 支付方式汇总
      * @return
      */
-    List<Order> payTypeCollect();
+    List<Map<String,Object>> payTypeCollect();
 
     /**
      * @param dateType(0月1年)
      * 日期汇总
      * @return
      */
-    List<Map<String,Object>> dateCollect(Integer dateType);
+    List<Map<String,Object>> dateCollect(Integer dateType,Date startTime,Date endTime);
 
 }

src/main/java/com/usky/dxtop/service/impl/OrderServiceImpl.java

@@ -46,7 +46,6 @@ import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletResponse;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
-import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -413,43 +412,33 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     }
 
     @Override
-    public List<Order> payTypeCollect() {
+    public List<Map<String, Object>> payTypeCollect() {
         QueryWrapper<Order> queryWrapper = new QueryWrapper<>();
         queryWrapper.select("sum(money) as money","pay_type as payType")
                 .groupBy("pay_type");
-        List<Order> list = this.list(queryWrapper);
+        List<Map<String, Object>> list = baseMapper.selectMaps(queryWrapper);
         for (OrderPayType orderPayType:OrderPayType.values()) {
-            if (orderPayType.getPayCode().equals(4)){
-                continue;
-            }
-            boolean present = list.stream().anyMatch(o -> o.getPayType().equals(orderPayType.getPayCode()));
+            boolean present = list.stream().anyMatch(o -> o.get("payType").equals(orderPayType.getPayCode()));
             if (!present){
-                Order order = new Order();
-                order.setPayType(orderPayType.getPayCode());
-                order.setMoney(new BigDecimal("0.00"));
-                list.add(order);
+                Map<String,Object> map = new HashMap<>();
+                map.put("payType",orderPayType.getPayCode());
+                map.put("money",0.00);
+                list.add(map);
             }
         }
         return list;
     }
 
     @Override
-    public List<Map<String, Object>> dateCollect(Integer dateType) {
-        Date startTime;
-        Date endTime;
+    public List<Map<String, Object>> dateCollect(Integer dateType,Date startTime,Date endTime) {
         String type;
-        Date date = new Date();
         int times;
         QueryWrapper<Order> queryWrapper = new QueryWrapper<>();
         if (0 == dateType){
             type = "EXTRACT(DAY FROM create_time)";
-            startTime =DateUtils.getFirstDayOfMonth(date);
-            endTime = DateUtils.getLastDayOfMonth(date);
             times = Integer.parseInt(DateUtils.getDay(endTime))+1;
         }else {
             type = "MONTH(create_time)";
-            startTime =DateUtils.getBeginDayOfYear(date);
-            endTime = DateUtils.getEndDayOfYear(date);
             times = 13;
         }
         queryWrapper.select(String.format("%s%s",type,"as orderTime"),"IFNULL(sum(money),0) as total")

src/main/java/com/usky/dxtop/service/impl/StaffRadioServiceImpl.java

@@ -27,10 +27,10 @@ public class StaffRadioServiceImpl extends ServiceImpl<StaffRadioMapper, StaffRa
     public void addList(List<StaffRadio> list) {
         list.forEach(staffRadio -> {
             LambdaUpdateWrapper<StaffRadio> updateWrapper = Wrappers.lambdaUpdate();
-            updateWrapper.eq(StaffRadio::getStaffId, staffRadio.getId())
-                    .eq(StaffRadio::getRadioId, staffRadio.getId())
+            updateWrapper.eq(StaffRadio::getStaffId, staffRadio.getStaffId())
+                    .eq(StaffRadio::getRadioId, staffRadio.getRadioId())
                     .set(StaffRadio::isDelFlag,staffRadio.isDelFlag());
-            this.saveOrUpdate(null,updateWrapper);
+            this.saveOrUpdate(staffRadio,updateWrapper);
         });
     }
 

src/main/resources/mapper/TopChannelMapper.xml

@@ -13,12 +13,12 @@
         <result property="updateTime"    column="update_time"    />
     </resultMap>
     <select id="channelOrderMoney" resultType="java.util.Map">
-        select tc.name as chName,sum(o.money) as money
+        select tc.name as chName,IFNULL(sum(o.money),0) as money
         from top_channel as tc
         left join t_order as o
         on tc.id = o.channel_id
-        group by tc.id
         where tc.del_flag = 0
+        group by tc.id
     </select>
 
 </mapper>