Skip to content

G
gogirl-miniapp-backend
Commit a1ad716a by huluobin
Options

mapper 修改

parent 4f641d74
Showing with 20 additions and 212 deletions
src/main/java/com/gogirl/application/order/serve/OrderManageService.java
......@@ -11,6 +11,7 @@ import com.gogirl.shared.order.serve.query.qry.ordermanage.ListOrderQuery;
import org.apache.ibatis.annotations.Param;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
/**
......@@ -97,8 +98,9 @@ public interface OrderManageService extends IService<OrderManage> {
* 发表订单评论
*
* @param cmd
* @return
*/
void addOrModifyOrderComment(CreateCommentCommand cmd);
List<OrderServe> addOrModifyOrderComment(CreateCommentCommand cmd);
Integer countOrderTimes(Integer customerId);
......
src/main/java/com/gogirl/application/order/serve/impl/OrderManageServiceImpl.java
......@@ -532,17 +532,16 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
}
@Override
public void addOrModifyOrderComment(CreateCommentCommand cmd) {
public List<OrderServe> addOrModifyOrderComment(CreateCommentCommand cmd) {
OrderManage orderManage = orderManageMapper.selectById(cmd.getOrderId());
if (!orderManage.getOrderUser().equals(cmd.getCurrentCustomerId())) {
throw new RRException();
}
if (!orderManage.getStatus().equals(OrderManage.STATUS_UN_COMMENT)
&& !orderManage.getStatus().equals(OrderManage.STATUS_FINISHED)) {
if (!orderManage.getStatus().equals(OrderManage.STATUS_UN_COMMENT)) {
throw new RRException("订单状态异常");
}
List<OrderServe> orderServeList = orderServeMapper.selectList(new LambdaQueryWrapper<OrderServe>().eq(OrderServe::getOrderId, orderManage.getId()));
List<Integer> orderServeIds = orderServeList.stream().map(OrderServe::getId).collect(Collectors.toList());
// List<Integer> commentOrderServeIds
//保存所有订单评论给
List<OrderCommentCommand> orderCommentCommandList = cmd.getCommentList();
orderCommentCommandList
......@@ -551,7 +550,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
OrderComment orderComment = new OrderComment();
orderComment.setId(orderCommentCommand.getId());
orderComment.setLabelSticker(orderCommentCommand.getLabelSticker());
orderComment.setLevel(2);
orderComment.setLevel(orderCommentCommand.getLevel());
orderComment.setOrderId(orderCommentCommand.getOrderId());
orderComment.setOrderServeId(orderCommentCommand.getOrderServeId());
orderComment.setPicturePath(orderCommentCommand.getPicturePath());
......@@ -580,13 +579,13 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
orderServeMapper.updateById(orderServe);
});
List<OrderServe> orderServeList = orderServeMapper.selectList(new LambdaQueryWrapper<OrderServe>().eq(OrderServe::getOrderId, orderManage.getId()));
//如果全部项评论了
if (orderServeList.stream().noneMatch(orderServe -> orderServe.getCommentStatus().equals(OrderServe.COMMENT_STATUS_NO))) {
orderManage.setStatus(OrderManage.STATUS_FINISHED);
}
//订单已完成
orderManageMapper.updateById(orderManage);
return orderServeList;
}
@Override
......
src/main/java/com/gogirl/application/order/serve/impl/ScheduleManageServiceImpl.java
......@@ -210,7 +210,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
serveEndTime.toInstant(ZoneOffset.of("+8")).toEpochMilli());
StoreTechnicianQuery query = storeTechnicianQueryList.stream().filter(storeTechnicianQuery -> !storeTechnicianQuery.getPeriodList().stream().map(period -> period.conflict(servePeriod))
.collect(Collectors.toList()).contains(true))
.findAny().orElse(null);
.findAny().orElse(new StoreTechnicianQuery());
StoreTechnician storeTechnician = storeTechnicianMapper.selectById(query.getTechnicianId());
return storeTechnician;
}
......
src/main/java/com/gogirl/infrastructure/config/WxMpConfiguration.java deleted 100644 → 0
//package com.gogirl.infrastructure.config;
//
//import com.google.common.collect.Maps;
//import me.chanjar.weixin.mp.api.WxMpInMemoryConfigStorage;
//import me.chanjar.weixin.mp.api.WxMpMessageRouter;
//import me.chanjar.weixin.mp.api.WxMpService;
//import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
//import me.chanjar.weixin.mp.constant.WxMpEventConstants;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.boot.context.properties.EnableConfigurationProperties;
//import org.springframework.context.annotation.Configuration;
//import sun.rmi.log.LogHandler;
//
//import javax.annotation.PostConstruct;
//import java.util.List;
//import java.util.Map;
//import java.util.stream.Collectors;
//
//import static me.chanjar.weixin.common.api.WxConsts.*;
//
///**
// * wechat mp configuration
// *
// * @author Binary Wang(https://github.com/binarywang)
// */
//@Configuration
//@EnableConfigurationProperties(WxMpProperties.class)
//public class WxMpConfiguration {
// private LogHandler logHandler;
// private NullHandler nullHandler;
// private KfSessionHandler kfSessionHandler;
// private StoreCheckNotifyHandler storeCheckNotifyHandler;
// private LocationHandler locationHandler;
// private MenuHandler menuHandler;
// private MsgHandler msgHandler;
// private UnsubscribeHandler unsubscribeHandler;
// private SubscribeHandler subscribeHandler;
// private ScanHandler scanHandler;
//
// private WxMpProperties properties;
//
// private static Map<String, WxMpMessageRouter> routers = Maps.newHashMap();
// private static Map<String, WxMpService> mpServices = Maps.newHashMap();
//
// @Autowired
// public WxMpConfiguration(LogHandler logHandler, NullHandler nullHandler, KfSessionHandler kfSessionHandler,
// StoreCheckNotifyHandler storeCheckNotifyHandler, LocationHandler locationHandler,
// MenuHandler menuHandler, MsgHandler msgHandler, UnsubscribeHandler unsubscribeHandler,
// SubscribeHandler subscribeHandler, ScanHandler scanHandler, WxMpProperties properties) {
// this.logHandler = logHandler;
// this.nullHandler = nullHandler;
// this.kfSessionHandler = kfSessionHandler;
// this.storeCheckNotifyHandler = storeCheckNotifyHandler;
// this.locationHandler = locationHandler;
// this.menuHandler = menuHandler;
// this.msgHandler = msgHandler;
// this.unsubscribeHandler = unsubscribeHandler;
// this.subscribeHandler = subscribeHandler;
// this.scanHandler = scanHandler;
// this.properties = properties;
// }
//
// public static Map<String, WxMpMessageRouter> getRouters() {
// return routers;
// }
//
// public static Map<String, WxMpService> getMpServices() {
// return mpServices;
// }
//
// @PostConstruct
// public void initServices() {
// // 代码里 getConfigs()处报错的同学，请注意仔细阅读项目说明，你的IDE需要引入lombok插件！！！！
// final List<WxMpProperties.MpConfig> configs = this.properties.getConfigs();
// if (configs == null) {
// throw new RuntimeException("大哥，拜托先看下项目首页的说明（readme文件），添加下相关配置，注意别配错了！");
// }
//
// mpServices = configs.stream().map(a -> {
// WxMpInMemoryConfigStorage configStorage = new WxMpInMemoryConfigStorage();
// configStorage.setAppId(a.getAppId());
// configStorage.setSecret(a.getSecret());
// configStorage.setToken(a.getToken());
// configStorage.setAesKey(a.getAesKey());
//
// WxMpService service = new WxMpServiceImpl();
// service.setWxMpConfigStorage(configStorage);
// routers.put(a.getAppId(), this.newRouter(service));
// return service;
// }).collect(Collectors.toMap(s -> s.getWxMpConfigStorage().getAppId(), a -> a, (o, n) -> o));
// }
//
// private WxMpMessageRouter newRouter(WxMpService wxMpService) {
// final WxMpMessageRouter newRouter = new WxMpMessageRouter(wxMpService);
//
// // 记录所有事件的日志 （异步执行）
// newRouter.rule().handler(this.logHandler).next();
//
// // 接收客服会话管理事件
// newRouter.rule().async(false).msgType(XmlMsgType.EVENT)
// .event(WxMpEventConstants.CustomerService.KF_CREATE_SESSION)
// .handler(this.kfSessionHandler).end();
// newRouter.rule().async(false).msgType(XmlMsgType.EVENT)
// .event(WxMpEventConstants.CustomerService.KF_CLOSE_SESSION)
// .handler(this.kfSessionHandler)
// .end();
// newRouter.rule().async(false).msgType(XmlMsgType.EVENT)
// .event(WxMpEventConstants.CustomerService.KF_SWITCH_SESSION)
// .handler(this.kfSessionHandler).end();
//
// // 门店审核事件
// newRouter.rule().async(false).msgType(XmlMsgType.EVENT)
// .event(WxMpEventConstants.POI_CHECK_NOTIFY)
// .handler(this.storeCheckNotifyHandler).end();
//
// // 自定义菜单事件
// newRouter.rule().async(false).msgType(XmlMsgType.EVENT)
// .event(MenuButtonType.CLICK).handler(this.menuHandler).end();
//
// // 点击菜单连接事件
// newRouter.rule().async(false).msgType(XmlMsgType.EVENT)
// .event(MenuButtonType.VIEW).handler(this.nullHandler).end();
//
// // 关注事件
// newRouter.rule().async(false).msgType(XmlMsgType.EVENT)
// .event(EventType.SUBSCRIBE).handler(this.subscribeHandler)
// .end();
//
// // 取消关注事件
// newRouter.rule().async(false).msgType(XmlMsgType.EVENT)
// .event(EventType.UNSUBSCRIBE)
// .handler(this.unsubscribeHandler).end();
//
// // 上报地理位置事件
// newRouter.rule().async(false).msgType(XmlMsgType.EVENT)
// .event(EventType.LOCATION).handler(this.locationHandler)
// .end();
//
// // 接收地理位置消息
// newRouter.rule().async(false).msgType(XmlMsgType.LOCATION)
// .handler(this.locationHandler).end();
//
// // 扫码事件
// newRouter.rule().async(false).msgType(XmlMsgType.EVENT)
// .event(EventType.SCAN).handler(this.scanHandler).end();
//
// // 默认
// newRouter.rule().async(false).handler(this.msgHandler).end();
//
// return newRouter;
// }
//
//}
src/main/java/com/gogirl/infrastructure/config/WxMpProperties.java deleted 100644 → 0
//package com.gogirl.infrastructure.config;
//
//import com.gogirl.wx.utils.JsonUtils;
//import lombok.Data;
//import org.springframework.boot.context.properties.ConfigurationProperties;
//
//import java.util.List;
//
///**
// * wechat mp properties
// *
// * @author Binary Wang(https://github.com/binarywang)
// */
//@Data
//@ConfigurationProperties(prefix = "wx.mp")
//public class WxMpProperties {
// private List<MpConfig> configs;
//
// @Data
// public static class MpConfig {
// /**
// * 设置微信公众号的appid
// */
// private String appId;
//
// /**
// * 设置微信公众号的app secret
// */
// private String secret;
//
// /**
// * 设置微信公众号的token
// */
// private String token;
//
// /**
// * 设置微信公众号的EncodingAESKey
// */
// private String aesKey;
// }
//
// @Override
// public String toString() {
// return JsonUtils.toJson(this);
// }
//}
src/main/java/com/gogirl/interfaces/order/serve/OrderCommentController.java
......@@ -2,6 +2,7 @@ package com.gogirl.interfaces.order.serve;
import com.gogirl.application.order.serve.OrderManageService;
import com.gogirl.application.xcx.GogirlTokenService;
import com.gogirl.domain.order.serve.OrderServe;
import com.gogirl.infrastructure.common.base.JsonResult;
import com.gogirl.infrastructure.common.exception.RRException;
import com.gogirl.shared.member.order.command.CreateCommentCommand;
......@@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Optional;
/**
......@@ -37,14 +39,14 @@ public class OrderCommentController {
*/
@PostMapping("/customer/ordercomment/addOrModifyOrderComment")
@ApiOperation(value = "订单服务评论")
public JsonResult<Void> addOrModifyOrderComment(@RequestHeader String token,
public JsonResult<List<OrderServe>> addOrModifyOrderComment(@RequestHeader String token,
@RequestBody CreateCommentCommand cmd) {
Integer currentCustomerId = Optional.ofNullable(gogirlTokenService.getByToken(token).getCustomerId())
.orElseThrow(() -> new RRException(500, "token不存在"));
cmd.setCurrentCustomerId(currentCustomerId);
log.info("订单评论开始 **");
orderManageService.addOrModifyOrderComment(cmd);
List<OrderServe> orderServeList = orderManageService.addOrModifyOrderComment(cmd);
log.info("订单评论结束 **");
return JsonResult.success();
}
......
src/main/java/com/gogirl/interfaces/order/serve/ScheduleManageController.java
......@@ -31,6 +31,7 @@ import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.*;
import java.text.ParseException;
......@@ -239,7 +240,9 @@ public class ScheduleManageController {
@PostMapping("/customer/queryLeisureTechnician")
public JsonResult<StoreTechnician> queryLeisureTechnician(@RequestParam Integer departmentId,
@RequestParam Integer serveId,
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss", iso = DateTimeFormat.ISO.DATE_TIME)
@RequestParam LocalDateTime serveStartTime,
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss", iso = DateTimeFormat.ISO.DATE_TIME)
@RequestParam LocalDateTime serveEndTime) throws ParseException {
StoreTechnician storeTechnician = scheduleManageService.queryLeisureTechnician(departmentId, serveId, serveStartTime, serveEndTime);
......
src/main/java/com/gogirl/shared/member/order/command/OrderCommentCommand.java
......@@ -31,7 +31,7 @@ public class OrderCommentCommand implements Serializable {
@ApiModelProperty("评论用户id")
private Integer userId;
@ApiModelProperty("等级")
@ApiModelProperty("订单服务评价等级")
private Integer level;
@ApiModelProperty("备注")
......@@ -57,6 +57,7 @@ public class OrderCommentCommand implements Serializable {
@ApiModelProperty("技师id 关联store_technician")
private Integer technicianId;
@ApiModelProperty("订单服务评论得分")
private Integer orderServeCommentScore;
}
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