Commit e25b6a15 by huluobin

update

parent 9e012b3e
...@@ -266,4 +266,7 @@ public class OrderManage implements Serializable { ...@@ -266,4 +266,7 @@ public class OrderManage implements Serializable {
this.discountPrice = this.discountPrice.add(discountPrice); this.discountPrice = this.discountPrice.add(discountPrice);
this.totalPaymentAmount = this.totalPaymentAmount.subtract(discountPrice); this.totalPaymentAmount = this.totalPaymentAmount.subtract(discountPrice);
} }
private Integer isSendCommentMsg;
} }
...@@ -51,4 +51,5 @@ public class GogirlProperties { ...@@ -51,4 +51,5 @@ public class GogirlProperties {
private String endTime; private String endTime;
public long testPaperTime;
} }
...@@ -46,4 +46,5 @@ public class WxProperties { ...@@ -46,4 +46,5 @@ public class WxProperties {
private String orderPayNotifyTpl; private String orderPayNotifyTpl;
public String testPaperTpl;
} }
...@@ -9,6 +9,7 @@ import com.gogirl.application.store.store.StoreManageService; ...@@ -9,6 +9,7 @@ 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.order.mall.MallOrder; import com.gogirl.domain.order.mall.MallOrder;
import com.gogirl.domain.order.serve.OrderManage;
import com.gogirl.domain.order.serve.ScheduleManage; import com.gogirl.domain.order.serve.ScheduleManage;
import com.gogirl.domain.order.serve.ScheduleServe; import com.gogirl.domain.order.serve.ScheduleServe;
import com.gogirl.domain.product.serve.BaseFeatures; import com.gogirl.domain.product.serve.BaseFeatures;
...@@ -22,8 +23,10 @@ import com.gogirl.domain.user.customer.Customer; ...@@ -22,8 +23,10 @@ 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.ListUtil; import com.gogirl.infrastructure.common.util.ListUtil;
import com.gogirl.infrastructure.config.GogirlProperties;
import com.gogirl.infrastructure.mapper.market.coupon.CouponCustomerRelevanceMapper; import com.gogirl.infrastructure.mapper.market.coupon.CouponCustomerRelevanceMapper;
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.OrderServeMapper; import com.gogirl.infrastructure.mapper.order.serve.OrderServeMapper;
import com.gogirl.infrastructure.mapper.order.serve.ScheduleManageMapper; import com.gogirl.infrastructure.mapper.order.serve.ScheduleManageMapper;
import com.gogirl.infrastructure.mapper.product.serve.BaseFeaturesMapper; import com.gogirl.infrastructure.mapper.product.serve.BaseFeaturesMapper;
...@@ -520,4 +523,28 @@ public class Schedule { ...@@ -520,4 +523,28 @@ public class Schedule {
log.info("定时同步门店数据** 任务结束"); log.info("定时同步门店数据** 任务结束");
} }
private final GogirlProperties gogirlProperties;
private OrderManageMapper orderManageMapper;
@Scheduled(cron = "0 0/1 * * * *")
public void testPaper() {
log.info("评价提醒推送");
Date date = new Date(System.currentTimeMillis() - gogirlProperties.getTestPaperTime() * 60000L);
List<OrderManage> orderManageList = orderManageMapper.selectList(
new LambdaQueryWrapper<OrderManage>()
.ne(OrderManage::getIsSendCommentMsg, 1)
.eq(OrderManage::getStatus, OrderManage.STATUS_UN_COMMENT)
.le(OrderManage::getCreateTime, date));
orderManageList.forEach(orderManage -> {
Customer customer = customerService.getById(orderManage.getOrderUser());
subscribeService.testPaper(customer.getOpenid1(), orderManage.getId());
orderManage.setIsSendCommentMsg(1);
orderManageMapper.updateById(orderManage);
});
log.info("评价提醒推送");
}
} }
...@@ -39,4 +39,6 @@ public interface SubscribeService { ...@@ -39,4 +39,6 @@ public interface SubscribeService {
* @param customerName 用户名字 * @param customerName 用户名字
*/ */
void sendOrderPayNotifyMsg(String openId, String serveName, String orderNo, BigDecimal paymentAmount, String customerName); void sendOrderPayNotifyMsg(String openId, String serveName, String orderNo, BigDecimal paymentAmount, String customerName);
void testPaper(String openid1, Integer id);
} }
...@@ -138,4 +138,23 @@ public class SubscribeServiceImpl implements SubscribeService { ...@@ -138,4 +138,23 @@ public class SubscribeServiceImpl implements SubscribeService {
.build()); .build());
} }
@Override
public void testPaper(String openId, Integer orderId) {
wxSubscribeControllerFeign.send(WxSubscribeMessageRequest
.builder()
.toUser(openId)
.accessToken(accessTokenService.getAccessToken().getAccessToken())
.page("pages/mine/comment?orderId=" + orderId)
//模板id
.templateId(wxProperties.getTestPaperTpl())
.data(TestPaperMsgData.builder()
.thing1(new MessageValue("评价有礼"))
.amount2(new MessageValue("¥10"))
.thing3(new MessageValue("点击进入小程序评价服务即可领取成功哦!"))
.build())
.build());
}
} }
package com.gogirl.shared.wx;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @Author robbendev
* @Description //TODO
* @Date 2019/12/29
**/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class TestPaperMsgData implements SubscribeMsgData {
/**
* 活动名称
*/
private MessageValue thing1;
/**
* 面值
*/
private MessageValue amount2;
/**
* 提醒内容
*/
private MessageValue thing3;
}
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