Commit bf54e487 by huluobin

没有填写推荐人的充值记录 自动记录美甲师

parent 798f83ab
...@@ -88,17 +88,16 @@ public class LocalCacheUtil { ...@@ -88,17 +88,16 @@ public class LocalCacheUtil {
} }
} }
private static class LocalCacheData<T> { private static class LocalCacheData {
private String key; private String key;
private T val; private Object val;
private long timeoutTime; private long timeoutTime;
public LocalCacheData() { public LocalCacheData() {
} }
public LocalCacheData(String key, T val, long timeoutTime) { public LocalCacheData(String key, Object val, long timeoutTime) {
this.key = key; this.key = key;
this.val = val; this.val = val;
this.timeoutTime = timeoutTime; this.timeoutTime = timeoutTime;
...@@ -116,7 +115,7 @@ public class LocalCacheUtil { ...@@ -116,7 +115,7 @@ public class LocalCacheUtil {
return val; return val;
} }
public void setVal(T val) { public void setVal(Object val) {
this.val = val; this.val = val;
} }
......
...@@ -36,8 +36,6 @@ ...@@ -36,8 +36,6 @@
</sql> </sql>
<select id="getBalanceRecordCard" resultMap="BaseResultMap" <select id="getBalanceRecordCard" resultMap="BaseResultMap"
parameterType="com.gogirl.domain.user.customer.CustomerBalanceRecord"> parameterType="com.gogirl.domain.user.customer.CustomerBalanceRecord">
SELECT t1.* SELECT t1.*
...@@ -55,14 +53,20 @@ ...@@ -55,14 +53,20 @@
<select id="getXcxChargeRecord" resultMap="BaseResultMap" parameterType="java.lang.String"> <select id="getXcxChargeRecord" resultMap="BaseResultMap" parameterType="java.lang.String">
select cbr.id, select cbr.id,
group_concat(os.technician_id) referee_id, group_concat(os.technician_id) referee_id,
(select om.department_id from order_manage om where om.order_user = cbr.customer_id and date_format(om.create_time, '%Y-%m-%d') = #{day} limit 1) department_id (select om.department_id
from order_manage om
where om.order_user = cbr.customer_id
and date_format(om.create_time, '%Y-%m-%d') = #{day}
limit 1) department_id
from customer_balance_record cbr from customer_balance_record cbr
left join order_manage om on om.order_user = cbr.customer_id and date_format(om.create_time, '%Y-%m-%d') = #{day} left join order_manage om
on om.order_user = cbr.customer_id and date_format(om.create_time, '%Y-%m-%d') = #{day}
left join order_serve os on os.order_id = om.id left join order_serve os on os.order_id = om.id
where date_format(cbr.time, '%Y-%m-%d') = #{day} where date_format(cbr.time, '%Y-%m-%d') = #{day}
and (cbr.type = 1 or cbr.type = 2) and (cbr.type = 1 or cbr.type = 2)
and (om.`status` = 3 or om.`status` = 4) and (om.`status` = 3 or om.`status` = 4)
and cbr.referee_id is null
GROUP BY cbr.id GROUP BY cbr.id
</select> </select>
<select id="queryPageAchieve" resultType="com.gogirl.domain.user.customer.CustomerBalanceRecord"> <select id="queryPageAchieve" resultType="com.gogirl.domain.user.customer.CustomerBalanceRecord">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment