Commit b7088197 by huluobin

次卡店铺id定时任务设置

parent 99bf1b12
...@@ -59,6 +59,9 @@ public class TimesCardCustomerRelevance { ...@@ -59,6 +59,9 @@ public class TimesCardCustomerRelevance {
@ApiModelProperty("1正常使用;2.次数用完;3.已过期;") @ApiModelProperty("1正常使用;2.次数用完;3.已过期;")
private Integer status; private Integer status;
@ApiModelProperty("店铺id 定时任务计算")
private Integer departmentId;
@TableField(exist = false) @TableField(exist = false)
private TimesCardType timesCardType; private TimesCardType timesCardType;
......
...@@ -112,7 +112,6 @@ public class LogAspect { ...@@ -112,7 +112,6 @@ public class LogAspect {
params.put("args", joinPoint.getArgs()); // 请求参数 params.put("args", joinPoint.getArgs()); // 请求参数
//params.put( "className", joinPoint.getSignature().getDeclaringTypeName() + "." + joinPoint.getSignature().getName() ); // 获取类名和获取类方法 //params.put( "className", joinPoint.getSignature().getDeclaringTypeName() + "." + joinPoint.getSignature().getName() ); // 获取类名和获取类方法
params.put("ip", getClientIp(request)); // 获取请求的ip地址 params.put("ip", getClientIp(request)); // 获取请求的ip地址
// 输出格式化后的json字符串 // 输出格式化后的json字符串
String paramsJson = JsonUtilByFsJson.beanToJson(params); String paramsJson = JsonUtilByFsJson.beanToJson(params);
......
...@@ -16,4 +16,11 @@ public interface TimesCardCustomerRelevanceMapper extends BaseMapper<TimesCardCu ...@@ -16,4 +16,11 @@ public interface TimesCardCustomerRelevanceMapper extends BaseMapper<TimesCardCu
* @return * @return
*/ */
List<Integer> queryTimesCardServeIds(Integer cardTypeId); List<Integer> queryTimesCardServeIds(Integer cardTypeId);
/**
* 没有设置店铺的次卡
*
* @return
*/
List<TimesCardCustomerRelevance> unSetDepartmentId();
} }
...@@ -2,6 +2,7 @@ package com.gogirl.infrastructure.mapper.order.serve; ...@@ -2,6 +2,7 @@ package com.gogirl.infrastructure.mapper.order.serve;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.gogirl.domain.order.serve.OrderManage; import com.gogirl.domain.order.serve.OrderManage;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import java.math.BigDecimal; import java.math.BigDecimal;
...@@ -21,7 +22,7 @@ public interface OrderManageMapper extends BaseMapper<OrderManage> { ...@@ -21,7 +22,7 @@ public interface OrderManageMapper extends BaseMapper<OrderManage> {
* @param departmentId * @param departmentId
* @return * @return
*/ */
BigDecimal countSumPay(Integer customerId, Integer departmentId); BigDecimal countSumPay(@Param("customerId") Integer customerId, @Param("departmentId") Integer departmentId);
/** /**
...@@ -38,4 +39,14 @@ public interface OrderManageMapper extends BaseMapper<OrderManage> { ...@@ -38,4 +39,14 @@ public interface OrderManageMapper extends BaseMapper<OrderManage> {
* @return order * @return order
*/ */
OrderManage latestOfDay(); OrderManage latestOfDay();
/**
* 获取用户当天第一个订单
*
* @param customerId
* @param createTime
* @return
*/
OrderManage firstOrderOfDay(@Param("customerId") Integer customerId, @Param("createTime") String createTime);
} }
...@@ -8,6 +8,7 @@ import com.gogirl.application.product.serve.ProduceSalesService; ...@@ -8,6 +8,7 @@ import com.gogirl.application.product.serve.ProduceSalesService;
import com.gogirl.application.store.store.StoreManageService; import com.gogirl.application.store.store.StoreManageService;
import com.gogirl.application.store.store.StoreTechnicianService; import com.gogirl.application.store.store.StoreTechnicianService;
import com.gogirl.application.user.customer.CustomerService; import com.gogirl.application.user.customer.CustomerService;
import com.gogirl.domain.market.timescard.TimesCardCustomerRelevance;
import com.gogirl.domain.order.mall.MallOrder; import com.gogirl.domain.order.mall.MallOrder;
import com.gogirl.domain.order.serve.OrderManage; import com.gogirl.domain.order.serve.OrderManage;
import com.gogirl.domain.order.serve.ScheduleManage; import com.gogirl.domain.order.serve.ScheduleManage;
...@@ -23,9 +24,11 @@ import com.gogirl.domain.store.store.StoreTechnician; ...@@ -23,9 +24,11 @@ import com.gogirl.domain.store.store.StoreTechnician;
import com.gogirl.domain.user.customer.Customer; import com.gogirl.domain.user.customer.Customer;
import com.gogirl.domain.user.customer.CustomerBalanceRecord; import com.gogirl.domain.user.customer.CustomerBalanceRecord;
import com.gogirl.domain.xcx.WeekConfig; import com.gogirl.domain.xcx.WeekConfig;
import com.gogirl.infrastructure.common.util.DateUtils;
import com.gogirl.infrastructure.common.util.ListUtil; import com.gogirl.infrastructure.common.util.ListUtil;
import com.gogirl.infrastructure.config.property.GogirlProperties; import com.gogirl.infrastructure.config.property.GogirlProperties;
import com.gogirl.infrastructure.mapper.market.coupon.CouponCustomerRelevanceMapper; import com.gogirl.infrastructure.mapper.market.coupon.CouponCustomerRelevanceMapper;
import com.gogirl.infrastructure.mapper.market.timescard.TimesCardCustomerRelevanceMapper;
import com.gogirl.infrastructure.mapper.order.mall.MallOrderMapper; import com.gogirl.infrastructure.mapper.order.mall.MallOrderMapper;
import com.gogirl.infrastructure.mapper.order.serve.OrderManageMapper; import com.gogirl.infrastructure.mapper.order.serve.OrderManageMapper;
import com.gogirl.infrastructure.mapper.order.serve.OrderServeMapper; import com.gogirl.infrastructure.mapper.order.serve.OrderServeMapper;
...@@ -107,6 +110,8 @@ public class Schedule { ...@@ -107,6 +110,8 @@ public class Schedule {
private final GogirlProperties gogirlProperties; private final GogirlProperties gogirlProperties;
private final TechnicianPushService technicianPushService; private final TechnicianPushService technicianPushService;
private final TimesCardCustomerRelevanceMapper timesCardCustomerRelevanceMapper;
/** /**
* 每天3点判断优惠券是否过期。 * 每天3点判断优惠券是否过期。
*/ */
...@@ -118,6 +123,25 @@ public class Schedule { ...@@ -118,6 +123,25 @@ public class Schedule {
} }
/** /**
* 每天23:50设置次卡店铺为购卡当天消费的店铺。如果购卡当天没有消费,次卡店铺计0。
*/
@Scheduled(cron = "0 50 23 * * *")
public void setTimesCardCustomerRelevanceDepartmentId() {
log.debug("每天晚上11:50定时设置当天服务的技师为推荐人** 任务开始");
List<TimesCardCustomerRelevance> timesCardCustomerRelevanceList = timesCardCustomerRelevanceMapper.unSetDepartmentId();
timesCardCustomerRelevanceList.forEach(timesCardCustomerRelevance -> {
OrderManage orderManage = orderManageMapper.firstOrderOfDay(timesCardCustomerRelevance.getCustomerId(), DateUtils.formatDateTime(timesCardCustomerRelevance.getCreateTime()));
if (orderManage != null) {
timesCardCustomerRelevance.setDepartmentId(orderManage.getDepartmentId());
timesCardCustomerRelevanceMapper.updateById(timesCardCustomerRelevance);
}
});
log.debug("每天晚上11:50定时设置当天服务的技师为推荐人** 任务结束");
}
/**
* 每天23:50设置推荐人:当天服务的技师为推荐人。 * 每天23:50设置推荐人:当天服务的技师为推荐人。
*/ */
@Scheduled(cron = "0 50 23 * * *") @Scheduled(cron = "0 50 23 * * *")
......
...@@ -20,5 +20,10 @@ ...@@ -20,5 +20,10 @@
GROUP BY id GROUP BY id
ORDER BY id asc ORDER BY id asc
</select> </select>
<select id="unSetDepartmentId" resultType="com.gogirl.domain.market.timescard.TimesCardCustomerRelevance">
select *
from times_card_customer_relevance
where department_id is null
</select>
</mapper> </mapper>
...@@ -406,7 +406,7 @@ ...@@ -406,7 +406,7 @@
select count(id) select count(id)
from order_manage from order_manage
where order_user = #{customerId} where order_user = #{customerId}
and (`status`=3 or `status`=4) and (`status` = 3 or `status` = 4)
</select> </select>
<select id="latestOfDay" resultType="com.gogirl.domain.order.serve.OrderManage"> <select id="latestOfDay" resultType="com.gogirl.domain.order.serve.OrderManage">
select * select *
...@@ -415,5 +415,14 @@ ...@@ -415,5 +415,14 @@
order by create_time desc order by create_time desc
limit 1 limit 1
</select> </select>
<select id="firstOrderOfDay" resultType="com.gogirl.domain.order.serve.OrderManage">
SELECT *
from order_manage
where order_user = #{customerId}
and DATE_FORMAT(create_time, '%y%m%d') = DATE_FORMAT(#{createTime}, '%y%m%d')
and (`status` = 3 or `status` = 4)
order by create_time
LIMIT 1
</select>
</mapper> </mapper>
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