From 54ad966d0b142c97fc659263b51d1ea5d7b5c7c6 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 28 五月 2021 16:17:08 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopOrderDAO.java | 253 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 233 insertions(+), 20 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopOrderDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopOrderDAO.java
index ef050c6..a026086 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopOrderDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopOrderDAO.java
@@ -2,12 +2,17 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.dtos.shop.PageComOrderListDTO;
+import com.panzhihua.common.model.vos.shop.*;
+import com.panzhihua.common.model.dtos.shop.*;
+import com.panzhihua.common.model.vos.shop.*;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.panzhihua.common.model.dtos.PageDTO;
-import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO;
import com.panzhihua.common.model.vos.shop.ComShopOrderVO;
-import com.panzhihua.common.model.vos.shop.ComShopStoreVO;
import com.panzhihua.service_community.model.dos.ComShopOrderDO;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/**
@@ -19,24 +24,232 @@
public interface ComShopOrderDAO extends BaseMapper<ComShopOrderDO> {
@Select("<script> " +
- "SELECT\n" +
- "id,\n" +
- "`name`,\n" +
- "photo_path,\n" +
- "phone,\n" +
- "integral,\n" +
- "create_at \n" +
- "FROM\n" +
- "com_mng_volunteer_mng \n" +
- " where state=2 and community_id=#{comMngVolunteerMngVO.communityId}" +
- "<if test='comMngVolunteerMngVO.name != null and comMngVolunteerMngVO.name.trim() != ""'>" +
- " and name like concat(#{comMngVolunteerMngVO.name},'%') \n" +
+ "select id as orderId,order_no,store_id,`status`,pay_status,receiver_id,total_amount as orderTotal,pay_amount,delivery_type,remark,create_at from com_shop_order as cso" +
+ " where 1=1 and cso.delete_status = 1 and cso.user_id = #{comOrderListDTO.userId}" +
+ "<if test='comOrderListDTO.status != null'>" +
+ " AND cso.status = #{comOrderListDTO.status} " +
" </if> " +
- "<if test='comMngVolunteerMngVO.phone != null and comMngVolunteerMngVO.phone.trim() != ""'>" +
- "AND phone like concat(#{comMngVolunteerMngVO.phone},'%') " +
- " </if> " +
- " order by integral desc,create_at desc"+
- "</script>")
- IPage<ComShopOrderVO> pageOrderBy(PageDTO page, PageComShopOrderSearchDTO pageComShopOrderSearchDTO);
+ " order by create_at desc " +
+ " </script>")
+ IPage<ComShopOrderPageVO> pageOrderList(Page page,@Param("comOrderListDTO") PageComOrderListDTO comOrderListDTO);
+ @Select("<script> " +
+ "SELECT distinct sr.id, sr.store_id, sr.user_id, su.phone AS userName , sr.order_no, sr.pay_no, \n" +
+ " sr.wx_tarde_no, sr.status, sr.pay_status, sr.receiver_id, \n" +
+ " sr.total_amount, sr.discount_amount, sr.pay_amount, sr.pay_type, \n" +
+ " sr.pay_time, sr.delivery_type, sr.delivery_status, sr.logistics_company, \n" +
+ " sr.logistics_no, sr.create_at, uad.name as receiver_name, uad.phone as receiver_phone, group_concat(og.goods_name) as goodsName, ss.name as store_name \n" +
+ " FROM com_shop_order sr LEFT JOIN com_shop_order_goods og ON sr.id = og.order_id \n" +
+ " LEFT JOIN com_shop_goods_attr ga ON og.goods_attr_id = ga.id \n" +
+ " LEFT JOIN sys_user su ON sr.user_id = su.user_id \n" +
+ " LEFT JOIN com_shop_user_address uad ON sr.receiver_id = uad.id \n" +
+ " LEFT JOIN com_shop_store ss ON sr.store_id = ss.id \n" +
+ " WHERE sr.delete_status = 1" +
+ "<if test='pageComShopOrderSearchDTO.userId != null'>" +
+ " AND sr.user_id = #{pageComShopOrderSearchDTO.userId} " +
+ " </if> " +
+ "<if test='pageComShopOrderSearchDTO.createAtStart != null'>" +
+ " AND #{pageComShopOrderSearchDTO.createAtStart} <![CDATA[<=]]> sr.create_at " +
+ " </if> " +
+ "<if test='pageComShopOrderSearchDTO.createAtEnd != null'>" +
+ " AND sr.create_at <![CDATA[<=]]> #{pageComShopOrderSearchDTO.createAtEnd} " +
+ " </if> " +
+ "<if test='pageComShopOrderSearchDTO.orderNo != null '>" +
+ " AND sr.order_no like concat('%', #{pageComShopOrderSearchDTO.orderNo}, '%') " +
+ " </if> " +
+ "<if test='pageComShopOrderSearchDTO.userAccount != null '>" +
+ " AND su.phone like concat('%', #{pageComShopOrderSearchDTO.userAccount}, '%') " +
+ " </if> " +
+ "<if test='pageComShopOrderSearchDTO.receiverAccount != null '>" +
+ " AND uad.name like concat('%', #{pageComShopOrderSearchDTO.receiverAccount}, '%') " +
+ " </if> " +
+ "<if test='pageComShopOrderSearchDTO.receiverPhone != null '>" +
+ " AND uad.phone like concat('%',#{pageComShopOrderSearchDTO.receiverPhone}, '%') " +
+ " </if> " +
+ "<if test='pageComShopOrderSearchDTO.goodsName != null'>" +
+ " AND og.goods_name like concat('%', #{pageComShopOrderSearchDTO.goodsName}, '%') " +
+ " </if> " +
+ "<if test='pageComShopOrderSearchDTO.status != null '>" +
+ " AND sr.status = #{pageComShopOrderSearchDTO.status} " +
+ " </if> " +
+ "<if test='pageComShopOrderSearchDTO.storeName != null '>" +
+ " AND ss.name like concat('%', #{pageComShopOrderSearchDTO.storeName}, '%') " +
+ " </if> " +
+ "<if test='pageComShopOrderSearchDTO.storeId != null '>" +
+ " AND ss.id = #{pageComShopOrderSearchDTO.storeId} " +
+ " </if> " +
+ "<if test='pageComShopOrderSearchDTO.storeUserId != null '>" +
+ " AND ss.sys_user_id = #{pageComShopOrderSearchDTO.storeUserId} " +
+ " </if> " +
+ " GROUP BY sr.id " +
+ " ORDER BY sr.create_at DESC "+
+ "</script>")
+ IPage<ComShopOrderSearchVO> pageOrderBy(Page page, @Param("pageComShopOrderSearchDTO") PageComShopOrderSearchDTO pageComShopOrderSearchDTO);
+
+ @Select("<script> " +
+ "SELECT sr.total_amount AS goods_total, GROUP_CONCAT(og.goods_name separator '\n') AS goods_name , sum(og.amount) AS goods_count, " +
+ " su.phone AS account, uad.name AS receiver, uad.phone AS receiverPhone, \n" +
+ " concat(uad.province_name, uad.city_name, uad.district_name, uad.detail_address) AS receiver_address, ss.name AS storeName, sr.remark," +
+ " CASE\n" +
+ " WHEN sr.`status` = 1 THEN '待付款' \n" +
+ " WHEN sr.`status` = 2 THEN '待发货' \n" +
+ " WHEN sr.`status` = 3 THEN '待收货' \n" +
+ " WHEN sr.`status` = 4 THEN '待评价' \n" +
+ " WHEN sr.`status` = 5 THEN '已完成' \n" +
+ " WHEN sr.`status` = 5 THEN '已取消' \n" +
+ " ELSE '---' \n" +
+ " END AS 'status' , " +
+ " sr.create_at, " +
+ " CASE WHEN sr.pay_time IS NOT NULL THEN sr.pay_time ELSE '---' END AS pay_time " +
+ " FROM com_shop_order sr LEFT JOIN com_shop_order_goods og ON sr.id = og.order_id \n" +
+ " LEFT JOIN com_shop_goods_attr ga ON og.goods_attr_id = ga.id \n" +
+ " LEFT JOIN sys_user su ON sr.user_id = su.user_id \n" +
+ " LEFT JOIN com_shop_user_address uad ON sr.receiver_id = uad.id \n" +
+ " LEFT JOIN com_shop_store ss ON sr.store_id = ss.id \n" +
+ " WHERE sr.delete_status = 1" +
+ "<if test='comShopOrderExportDTO.userId != null'>" +
+ " AND sr.user_id = #{comShopOrderExportDTO.userId} " +
+ " </if> " +
+ "<if test='comShopOrderExportDTO.storeUserId != null '>" +
+ " AND ss.sys_user_id = #{comShopOrderExportDTO.storeUserId} " +
+ " </if> " +
+ "<if test='comShopOrderExportDTO.orderIds != null and comShopOrderExportDTO.orderIds.length>0 '>" +
+ " AND sr.id in " +
+ "<foreach collection='comShopOrderExportDTO.orderIds' item='id' index='index' open='(' close=')' separator=',' >\n" +
+ " #{id}" +
+ "</foreach>" +
+ " </if> " +
+
+ "<if test='comShopOrderExportDTO.orderIds == null or comShopOrderExportDTO.orderIds.length==0 '>" +
+ "<if test='comShopOrderExportDTO.createAtStart != null '>" +
+ " AND #{comShopOrderExportDTO.createAtStart} <![CDATA[<=]]> sr.create_at " +
+ " </if> " +
+ "<if test='comShopOrderExportDTO.createAtEnd != null'>" +
+ " AND sr.create_at <![CDATA[<=]]> #{comShopOrderExportDTO.createAtEnd} " +
+ " </if> " +
+ "<if test='comShopOrderExportDTO.orderNo != null '>" +
+ " AND sr.order_no = #{comShopOrderExportDTO.orderNo} " +
+ " </if> " +
+ "<if test='comShopOrderExportDTO.userAccount != null '>" +
+ " AND su.phone = #{comShopOrderExportDTO.userAccount} " +
+ " </if> " +
+ "<if test='comShopOrderExportDTO.receiverAccount != null'>" +
+ " AND uad.name = #{comShopOrderExportDTO.receiverAccount} " +
+ " </if> " +
+ "<if test='comShopOrderExportDTO.receiverPhone != null '>" +
+ " AND uad.phone = #{comShopOrderExportDTO.receiverPhone} " +
+ " </if> " +
+ "<if test='comShopOrderExportDTO.goodsName != null '>" +
+ " AND og.name like concat('%', #{comShopOrderExportDTO.goodsName}, '%') " +
+ " </if> " +
+ "<if test='comShopOrderExportDTO.status != null '>" +
+ " AND sr.status = #{comShopOrderExportDTO.status} " +
+ " </if> " +
+ " </if> " +
+ " GROUP BY sr.id ORDER BY sr.create_at "+
+ "</script>")
+ IPage<ExcelShopOrderDTO> selectOrderExport(Page page, @Param("comShopOrderExportDTO") ComShopOrderExportDTO comShopOrderExportDTO);
+
+ @Select("<script> " +
+ "SELECT sr.total_amount, sr.pay_time, sr.order_no, \n" +
+ " CASE WHEN sr.pay_type = 1 THEN '微信支付' ELSE '' END AS payType, \n" +
+ " '收入' AS 'type' " +
+ "FROM com_shop_order sr LEFT JOIN com_shop_store st ON sr.store_id = st.id \n" +
+ " WHERE sr.pay_status = 2 AND sr.delete_status=1 " +
+ "<if test='comShopFundsExportDTO.userId != null'>" +
+ " AND st.sys_user_id = #{comShopFundsExportDTO.userId} " +
+ " </if> " +
+ "<if test='comShopFundsExportDTO.orderIds != null and comShopFundsExportDTO.orderIds.length>0 '>" +
+ " AND sr.id in " +
+ "<foreach collection='comShopFundsExportDTO.orderIds' item='id' index='index' open='(' close=')' separator=',' >\n" +
+ " #{id}" +
+ "</foreach>" +
+ " </if> " +
+ "<if test='comShopFundsExportDTO.orderIds == null or comShopFundsExportDTO.orderIds.length==0 '>" +
+ "<if test='comShopFundsExportDTO.payTimeStart != null'>" +
+ " AND #{comShopFundsExportDTO.payTimeStart} <![CDATA[<=]]> sr.pay_time " +
+ " </if> " +
+ "<if test='comShopFundsExportDTO.payTimeEnd != null'>" +
+ " AND sr.pay_time <![CDATA[<=]]> #{comShopFundsExportDTO.payTimeEnd} " +
+ " </if> " +
+ "<if test='comShopFundsExportDTO.orderNo != null '>" +
+ " AND sr.order_no = #{comShopFundsExportDTO.orderNo} " +
+ " </if> " +
+ " </if> " +
+ " GROUP BY sr.id ORDER BY sr.create_at DESC "+
+ "</script>")
+ IPage<ExcelShopFundsDTO> selectFundsExport(Page page, @Param("comShopFundsExportDTO") ComShopFundsExportDTO comShopFundsExportDTO);
+
+ @Select("<script> " +
+ " SELECT sys_user_id,\n" +
+ " COALESCE(SUM(CASE WHEN abt.days = DATE_FORMAT(NOW(),'%Y%m%d') THEN abt.t END), 0) AS todayTotal,\n" +
+ " COALESCE(SUM(CASE WHEN abt.days = DATE_FORMAT(NOW(),'%Y%u') THEN abt.t END), 0) AS weekTotal,\n" +
+ " COALESCE(SUM(CASE WHEN abt.days = DATE_FORMAT(NOW(),'%Y%m') THEN abt.t END), 0) AS monthTotal\n" +
+ "FROM (\n" +
+ "SELECT ss.sys_user_id, sum(sr.pay_amount) AS t , DATE_FORMAT(sr.pay_time,'%Y%m%d') days\n" +
+ "FROM com_shop_order sr LEFT JOIN com_shop_store ss ON sr.store_id = ss.id\n" +
+ "WHERE sr.pay_status = 2 AND DATE_FORMAT(sr.pay_time,'%Y%m%d') = DATE_FORMAT(NOW(),'%Y%m%d')\n" +
+ "<if test='userId!=null and userId!=0L'>" +
+ " and ss.sys_user_id = #{userId}\n" +
+ "</if>" +
+ "GROUP BY days\n" +
+ "UNION \n" +
+ "SELECT ss.sys_user_id, sum(sr.pay_amount) AS t, DATE_FORMAT(sr.pay_time,'%Y%u') weeks\n" +
+ "FROM com_shop_order sr LEFT JOIN com_shop_store ss ON sr.store_id = ss.id\n" +
+ "WHERE sr.pay_status = 2 AND DATE_FORMAT(sr.pay_time,'%Y%u') = DATE_FORMAT(NOW(),'%Y%u')\n" +
+ "<if test='userId!=null and userId!=0L'>" +
+ " and ss.sys_user_id = #{userId}\n" +
+ "</if>" +
+ "GROUP BY weeks\n" +
+ "UNION \n" +
+ "SELECT ss.sys_user_id, sum(sr.pay_amount) AS t, DATE_FORMAT(sr.pay_time,'%Y%m') months\n" +
+ "FROM com_shop_order sr LEFT JOIN com_shop_store ss ON sr.store_id = ss.id\n" +
+ "WHERE sr.pay_status = 2 AND DATE_FORMAT(sr.pay_time,'%Y%m') = DATE_FORMAT(NOW(),'%Y%m')\n" +
+ "<if test='userId!=null and userId!=0L'>" +
+ " and ss.sys_user_id = #{userId}\n" +
+ "</if>" +
+ "GROUP BY months\n" +
+ ") abt\n" +
+ "GROUP BY abt.sys_user_id "+
+ "</script>")
+ ComShopFundsVO queryStatis(@Param("userId") Long userId);
+
+ @Select("<script> " +
+ "SELECT sr.id, sr.total_amount, sr.pay_time, sr.order_no, \n" +
+ " CASE WHEN sr.pay_type = 1 THEN '微信支付' ELSE '' END AS payType, \n" +
+ " '收入' AS 'type' " +
+ "FROM com_shop_order sr LEFT JOIN com_shop_store st ON sr.store_id = st.id \n" +
+ " WHERE sr.pay_status = 2 AND sr.delete_status=1 " +
+ "<if test='pageComShopFundsSearchDTO.userId != null'>" +
+ " AND st.sys_user_id = #{pageComShopFundsSearchDTO.userId} " +
+ " </if> " +
+ "<if test='pageComShopFundsSearchDTO.payTimeStart != null'>" +
+ " AND #{pageComShopFundsSearchDTO.payTimeStart} <![CDATA[<=]]> sr.pay_time " +
+ " </if> " +
+ "<if test='pageComShopFundsSearchDTO.payTimeEnd != null'>" +
+ " AND sr.pay_time <![CDATA[<=]]> #{pageComShopFundsSearchDTO.payTimeEnd} " +
+ " </if> " +
+ "<if test='pageComShopFundsSearchDTO.orderNo != null '>" +
+ " AND sr.order_no = #{pageComShopFundsSearchDTO.orderNo} " +
+ " </if> " +
+ " GROUP BY sr.id ORDER BY sr.create_at DESC "+
+ "</script>")
+ IPage<ComShopFundsOrderVO> pageShopFunds(Page page, @Param("pageComShopFundsSearchDTO") PageComShopFundsSearchDTO pageComShopFundsSearchDTO);
+
+ @Select("<script> " +
+ "SELECT\n" +
+ "css.store_account,\n" +
+ "css.`contacts`,\n" +
+ "css.`name` as storeName,\n" +
+ "cso.total_amount,\n" +
+ "cso.pay_type,\n" +
+ "cso.pay_time, \n" +
+ "cso.create_at, \n" +
+ "cso.order_no\n" +
+ "FROM\n" +
+ "com_shop_order cso\n" +
+ "left JOIN com_shop_store css on cso.store_id=css.id \n" +
+ "where cso.id =#{id} "+
+ "</script>")
+ CapitalDetailVO capitalDetailByStore(@Param("id")Long id);
}
--
Gitblit v1.7.1