1、提货点
2、客服(腾讯云智服)
3、接口权限控制
4、复制第三方商品可配置
4、优化附件上传配置
5、手机端核销订单
6、手机端订单统计、订单管理
7、短信优化
8、订阅消息全自动化
This commit is contained in:
张乐
2020-09-15 16:13:25 +08:00
parent 184852afe4
commit 93a781c5ae
245 changed files with 26031 additions and 994 deletions

View File

@@ -11,4 +11,37 @@
<select id="getRefundTotal" resultType="java.lang.Integer">
select count(id) from eb_store_order where ${where} and refund_status = 2
</select>
<select id="getOrderVerificationDetail" parameterType="com.common.PageParamRequest"
resultType="com.zbkj.crmeb.store.response.StoreStaffDetail">
select sum(o.`pay_price`) as price, count(o.`id`) as count, DATE_FORMAT(o.`create_time`, '%Y-%m-%d') as time
from `eb_store_order` o
where o.`is_del` = 0 and o.`paid` = 1 and o.`refund_status` = 0
<if test="null != startTime and startTime != ''">
and o.create_time >= #{ startTime }
</if>
<if test="null != endTime and endTime != ''">
and o.create_time &lt; #{ endTime }
</if>
GROUP by DATE_FORMAT(o.`create_time`, '%Y-%m-%d') order by o.`create_time` desc limit #{ page },#{ limit };
</select>
<select id="getOrderStatisticsPriceDetail" parameterType="com.zbkj.crmeb.store.request.StoreDateRangeSqlPram"
resultType="com.zbkj.crmeb.store.response.StoreOrderStatisticsChartItemResponse">
select sum(o.pay_price) as num,date_format(o.create_time, '%Y-%m-%d') as time
from eb_store_order o
where o.is_del >= 0 and o.paid >= 1 and o.refund_status >= 0
and o.create_time >= #{ startTime }
and o.create_time &lt; #{ endTime }
group by date_format(o.create_time, '%Y-%m-%d')
order by o.create_time desc;
</select>
<select id="getOrderStatisticsOrderCountDetail" parameterType="com.zbkj.crmeb.store.request.StoreDateRangeSqlPram"
resultType="com.zbkj.crmeb.store.response.StoreOrderStatisticsChartItemResponse">
select count(id) as num, date_format(o.create_time, '%Y-%m-%d') as time
from eb_store_order o
where o.is_del >= 0 and o.paid >= 1 and o.refund_status >= 0
and o.create_time >= #{ startTime }
and o.create_time &lt; #{ endTime }
group by date_format(o.create_time, '%Y-%m-%d')
order by o.create_time asc;
</select>
</mapper>

View File

@@ -3,6 +3,8 @@
<mapper namespace="com.zbkj.crmeb.system.dao.SystemStoreDao">
<select id="getNearList" resultType="com.zbkj.crmeb.system.vo.SystemStoreNearVo" parameterType="com.zbkj.crmeb.front.request.StoreNearRequest">
SELECT *, (round(6367000 * 2 * asin(sqrt(pow(sin(((latitude * pi()) / 180 - (${latitude} * pi()) / 180) / 2), 2) + cos((${latitude} * pi()) / 180) * cos((latitude * pi()) / 180) * pow(sin(((longitude * pi()) / 180 - (${longitude} * pi()) / 180) / 2), 2))))) AS distance FROM eb_system_store ORDER BY distance asc
SELECT *, (round(6367000 * 2 * asin(sqrt(pow(sin(((latitude * pi()) / 180 - (${latitude} * pi()) / 180) / 2), 2) + cos((${latitude} * pi()) / 180) * cos((latitude * pi()) / 180) * pow(sin(((longitude * pi()) / 180 - (${longitude} * pi()) / 180) / 2), 2))))) AS distance
FROM eb_system_store WHERE is_show = 1 and is_del = 0
ORDER BY distance asc
</select>
</mapper>

View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zbkj.crmeb.wechat.dao.WechatProgramMyTempDao">
</mapper>

View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zbkj.crmeb.wechat.dao.WechatProgramPublicTempDao">
</mapper>