京东到家外卖统计

lb-app/src/test/java/com/ydd/app/Test.java

@@ -1,60 +1,80 @@
-package com.ydd.app;
-
-import com.ydd.AppApplication;
-import com.ydd.app.service.ApiStatisticsService;
-import com.ydd.app.service.ApiWaimaiPrintService;
-import com.ydd.module.domain.WaimaiOrder;
-import com.ydd.module.push.MessagePushService;
-import com.ydd.module.service.IOrderPushMessageService;
-import com.ydd.module.service.IWaimaiOrderService;
-import org.apache.commons.collections4.CollectionUtils;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.util.List;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = AppApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-public class Test {
-    @Autowired
-    private  IWaimaiOrderService iWaimaiOrderService;
-    @Autowired
-    private  MessagePushService messagePushService;
-
-    @Autowired
-    private  IOrderPushMessageService iOrderPushMessageService;
-    @Autowired
-    private  ApiStatisticsService apiStatisticsService;
-    @Autowired
-    private  ApiWaimaiPrintService apiWaimaiPrintService;
-
-//
-    public  void test(){
-        String title = "您有一个订单5分钟内没有骑手接单，请及时关注";
-        String content = "您有一个订单5分钟内没有骑手接单，请及时关注";
-        List<WaimaiOrder> list = iWaimaiOrderService.queryTimeOutFiveOrder();
-        if (CollectionUtils.isNotEmpty(list)) {
-            for (WaimaiOrder waimaiOrder : list) {
-                messagePushService.riderMissedOrderMessage(waimaiOrder, title, content);
-            }
-        }
-
-    }
-
-    @org.junit.Test
-    public  void testtj(){
-        System.out.println(apiStatisticsService.shop(185l,164l,3,null,null));
-    }
-
-    @org.junit.Test
-    public  void testPrint(){
-//        ResObject res = elemeClient.getNonReachedOMessages("06143463292980a8ec66c0a2000102b5",77457529);
-//        System.out.println(JSONObject.toJSONString(res));
-       // elemeAuthClient.doRefreshToken("c54df9d9bcc3d605417111aea02f2e48");
-
-        apiWaimaiPrintService.printTestWaimai("50005126", 1358L, "");
-    }
-
-}
+//package com.ydd.app;
+//
+//import com.alibaba.fastjson.JSON;
+//import com.alibaba.fastjson.JSONArray;
+//import com.alibaba.fastjson.JSONObject;
+//import com.ydd.AppApplication;
+//import com.ydd.app.service.ApiStatisticsService;
+//import com.ydd.app.service.ApiWaimaiPrintService;
+//import com.ydd.module.domain.WaimaiOrder;
+//import com.ydd.module.push.MessagePushService;
+//import com.ydd.module.service.IOrderPushMessageService;
+//import com.ydd.module.service.IWaimaiOrderService;
+//import com.ydd.third.common.vo.ResObject;
+//import com.ydd.third.delivery.meituan.MeituanSgClient;
+//import com.ydd.third.delivery.vo.order.OrderVo;
+//import com.ydd.third.waimai.eleme.ElemeAuthClient;
+//import com.ydd.third.waimai.eleme.ElemeClient;
+//import org.apache.commons.collections4.CollectionUtils;
+//import org.junit.runner.RunWith;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.test.context.SpringBootTest;
+//import org.springframework.test.context.junit4.SpringRunner;
+//
+//import javax.annotation.Resource;
+//import java.util.List;
+//import java.util.regex.Matcher;
+//import java.util.regex.Pattern;
+//
+//@RunWith(SpringRunner.class)
+//@SpringBootTest(classes = AppApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+//public class Test {
+//    @Autowired
+//    private  IWaimaiOrderService iWaimaiOrderService;
+//    @Autowired
+//    private  MessagePushService messagePushService;
+//
+//    @Autowired
+//    private  IOrderPushMessageService iOrderPushMessageService;
+//    @Autowired
+//    private  ApiStatisticsService apiStatisticsService;
+//    @Autowired
+//    private  ApiWaimaiPrintService apiWaimaiPrintService;
+//    @Resource
+//    private ElemeAuthClient elemeAuthClient;
+//    @Resource
+//    private  ElemeClient elemeClient;
+//    @Resource
+//    private MeituanSgClient meituanSgClient;
+////
+//    public  void test(){
+//        String title = "您有一个订单5分钟内没有骑手接单，请及时关注";
+//        String content = "您有一个订单5分钟内没有骑手接单，请及时关注";
+//        List<WaimaiOrder> list = iWaimaiOrderService.queryTimeOutFiveOrder();
+//        if (CollectionUtils.isNotEmpty(list)) {
+//            for (WaimaiOrder waimaiOrder : list) {
+//                messagePushService.riderMissedOrderMessage(waimaiOrder, title, content);
+//            }
+//        }
+//
+//    }
+//
+//    @org.junit.Test
+//    public  void testtj(){
+//        System.out.println(apiStatisticsService.shop(185l,164l,3,null,null));
+//    }
+//
+//    @org.junit.Test
+//    public  void testPrint(){
+////        ResObject res = elemeClient.getNonReachedOMessages("06143463292980a8ec66c0a2000102b5",77457529);
+////        System.out.println(JSONObject.toJSONString(res));
+//       // elemeAuthClient.doRefreshToken("c54df9d9bcc3d605417111aea02f2e48");
+//
+//        //apiWaimaiPrintService.printTestWaimai("50005126", 342514L,"4377979561300340297");.
+//        OrderVo orderVo = new OrderVo();
+//        orderVo.setZbToken("token_lt5wP20-mAgj4JUczj1ErQ");
+//        orderVo.setOrderingSourceNo("56835752520387746");
+//        meituanSgClient.zhongBaoFee(orderVo);
+//    }
+//
+//}

lb-module/src/main/java/com/ydd/module/domain/ProfitsWaimaiOrder.java

@@ -78,6 +78,14 @@ public class ProfitsWaimaiOrder implements Serializable {
     @Excel(name = "美团闪购订单笔数")
     private Integer meiTuanSgOrderNum;
 
+    /** 京东到家订单金额 */
+    @Excel(name = "京东到家订单金额")
+    private BigDecimal jdHomePayAmount;
+
+    /** 京东到家订单笔数 */
+    @Excel(name = "京东到家订单笔数")
+    private Integer jdHomeOrderNum;
+
     private Integer orderType;
 
     @TableField(exist = false)

lb-module/src/main/java/com/ydd/module/enums/OrderTypesEnum.java

@@ -20,7 +20,12 @@ public enum OrderTypesEnum {
     /**
      * 美团闪购
      */
-    MEI_TUAN_SG(5,"美团闪购");
+    MEI_TUAN_SG(5,"美团闪购"),
+
+    /**
+     * 京东到家
+     */
+    JD_HOME(6,"京东到家");
 
     public Integer status;
     public String name;

lb-module/src/main/java/com/ydd/module/service/impl/ProfitsWaimaiOrderServiceImpl.java

@@ -62,6 +62,9 @@ public class ProfitsWaimaiOrderServiceImpl extends ServiceImpl<ProfitsWaimaiOrde
                         } else if (dto.getOrderType().equals(OrderTypesEnum.MEI_TUAN_SG.status)) {
                             profitsWaimaiOrder.setMeiTuanSgOrderNum(dto.getNum());
                             profitsWaimaiOrder.setMeiTuanSgPayAmount(dto.getPayAmount());
+                        } else if (dto.getOrderType().equals(OrderTypesEnum.JD_HOME.status)) {
+                            profitsWaimaiOrder.setJdHomeOrderNum(dto.getNum());
+                            profitsWaimaiOrder.setJdHomePayAmount(dto.getPayAmount());
                         }
 //                        String createDate = DateFormatUtils.format(DateUtils.addDateDays(new Date(), -finalI +1), "yyyy-MM-dd");
                         String createDate = DateFormatUtils.format(DateUtils.addDateDays(new Date(), 0), "yyyy-MM-dd");

lb-module/src/main/resources/mapper/module/WaimaiOrderMapper.xml

@@ -70,6 +70,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         COALESCE(SUM(e_bai_order_num),0) AS e_bai_order_num,
         COALESCE(SUM(mei_tuan_sg_pay_amount),0) AS mei_tuan_sg_pay_amount,
         COALESCE(SUM(mei_tuan_sg_order_num),0) AS mei_tuan_sg_order_num,
+        COALESCE(SUM(jd_home_pay_amount),0) AS jd_home_pay_amount,
+        COALESCE(SUM(jd_home_order_num),0) AS jd_home_order_num,
         `year`,`month`,`day`
         FROM
         lb_profits_waimaiOrder
@@ -102,6 +104,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             COALESCE(SUM(e_bai_order_num),0) AS e_bai_order_num,
             COALESCE(SUM(mei_tuan_sg_pay_amount),0) AS mei_tuan_sg_pay_amount,
             COALESCE(SUM(mei_tuan_sg_order_num),0) AS mei_tuan_sg_order_num,
+            COALESCE(SUM(jd_home_pay_amount),0) AS jd_home_pay_amount,
+            COALESCE(SUM(jd_home_order_num),0) AS jd_home_order_num,
             `year`,`month`,`day`,create_time
         FROM
         lb_profits_waimaiOrder
@@ -378,6 +382,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         COALESCE(SUM(e_bai_order_num),0) AS e_bai_order_num,
         COALESCE(SUM(mei_tuan_sg_pay_amount),0) AS mei_tuan_sg_pay_amount,
         COALESCE(SUM(mei_tuan_sg_order_num),0) AS mei_tuan_sg_order_num,
+        COALESCE(SUM(jd_home_pay_amount),0) AS jd_home_pay_amount,
+        COALESCE(SUM(jd_home_order_num),0) AS jd_home_order_num,
         `year`,`month`,`day`,create_time
         FROM
         lb_profits_waimaiOrder

web-ui/src/views/module/dataInfo/waimaiStatistics.vue

@@ -29,6 +29,10 @@
       <el-table-column prop="eleMeOrderNum" header-align="center"  align="center" label="饿了么订单笔数"></el-table-column>
       <el-table-column prop="ebaiPayAmount" header-align="center"  align="center" label="饿百订单金额"></el-table-column>
       <el-table-column prop="ebaiOrderNum" header-align="center"  align="center" label="饿百订单笔数"></el-table-column>
+      <el-table-column prop="meiTuanSgPayAmount" header-align="center"  align="center" label="美团闪购订单金额"></el-table-column>
+      <el-table-column prop="meiTuanSgOrderNum" header-align="center"  align="center" label="美团闪购订单笔数"></el-table-column>
+      <el-table-column prop="jdHomePayAmount" header-align="center"  align="center" label="京东到家订单金额"></el-table-column>
+      <el-table-column prop="jdHomeOrderNum" header-align="center"  align="center" label="京东到家订单笔数"></el-table-column>
     </el-table>
 
     <Pagination uri="/module/waimaiOrder/get/waimaiList" :request-params="params" ref="pagination" :showIndex="false">
@@ -45,6 +49,10 @@
       <el-table-column prop="eleMeOrderNum" header-align="center"  align="center" label="饿了么订单笔数"></el-table-column>
       <el-table-column prop="ebaiPayAmount" header-align="center"  align="center" label="饿百订单金额"></el-table-column>
       <el-table-column prop="ebaiOrderNum" header-align="center"  align="center" label="饿百订单笔数"></el-table-column>
+      <el-table-column prop="meiTuanSgPayAmount" header-align="center"  align="center" label="美团闪购订单金额"></el-table-column>
+      <el-table-column prop="meiTuanSgOrderNum" header-align="center"  align="center" label="美团闪购订单笔数"></el-table-column>
+      <el-table-column prop="jdHomePayAmount" header-align="center"  align="center" label="京东到家订单金额"></el-table-column>
+      <el-table-column prop="jdHomeOrderNum" header-align="center"  align="center" label="京东到家订单笔数"></el-table-column>
     </Pagination>
   </div>
 </template>
@@ -151,6 +159,14 @@ export default {
             data.eBaiPayAmount = 0
             data.eBaiOrderNum = 0
           }
+          if(!data.meiTuanSgPayAmount){
+            data.meiTuanSgPayAmount = 0
+            data.meiTuanSgOrderNum = 0
+          }
+          if(!data.jdHomePayAmount){
+            data.jdHomePayAmount = 0
+            data.jdHomeOrderNum = 0
+          }
           this.list = []
           this.list.push(data)
         }