diff --git a/src/main/java/com/sqx/map/CommonMapUtils.java b/src/main/java/com/sqx/map/CommonMapUtils.java index 21766d1..34df65e 100644 --- a/src/main/java/com/sqx/map/CommonMapUtils.java +++ b/src/main/java/com/sqx/map/CommonMapUtils.java @@ -83,6 +83,9 @@ public class CommonMapUtils { String status = jsonObject.getString("status"); if ("0".equals(status)) { result = jsonObject.getJSONObject("result"); + } else if("348".equals(status)) { + result = new JSONObject(); + result.put("distance",0); } else { log.error("返回值：{}",jsonObject.toJSONString()); log.error("转换失败！！！原因:" + jsonObject.getString("message")); @@ -255,6 +258,13 @@ public class CommonMapUtils { String status = jsonObject.getString("status"); if ("0".equals(status)) { result = jsonObject.getJSONObject("result"); + } else if("348".equals(status)) { + result = new JSONObject(); + JSONObject son = new JSONObject(); + son.put("distance",0); + JSONArray ja = new JSONArray(); + ja.add(son); + result.put("routes",ja); } else { log.error("返回值：{}",jsonObject.toJSONString()); log.error("{}路线计算失败: {}",tripWay == 1?"公交":"驾车" , jsonObject.getString("message")); diff --git a/src/main/java/com/sqx/modules/artificer/controller/app/AppArtificerTimeController.java b/src/main/java/com/sqx/modules/artificer/controller/app/AppArtificerTimeController.java index 5289c49..4f3f8eb 100644 --- a/src/main/java/com/sqx/modules/artificer/controller/app/AppArtificerTimeController.java +++ b/src/main/java/com/sqx/modules/artificer/controller/app/AppArtificerTimeController.java @@ -50,6 +50,30 @@ public class AppArtificerTimeController { return artificerTimeService.setArtificerTime( idleTime, busyTime, artificerId); } + /** + * @param idleTime 可接单时间 + * @param artificerId 技师ID + * @return + */ + @PostMapping("/setArtificerJdTime") + @ApiOperation("设置可接单时间") + @Login + public Result setArtificerJdTime(String idleTime,Long artificerId){ + return artificerTimeService.setArtificerJdTime( idleTime, artificerId); + } + + /** + * @param busyTime 不可接单时间 + * @param artificerId 技师ID + * @return + */ + @PostMapping("/setArtificerBjdTime") + @ApiOperation("设置不可接单时间") + @Login + public Result setArtificerBjdTime(String busyTime,Long artificerId){ + return artificerTimeService.setArtificerBjdTime( busyTime, artificerId); + } + /** * @param flag 1接单 2不接单 * @param artificerId diff --git a/src/main/java/com/sqx/modules/artificer/dao/OrdersDao.java b/src/main/java/com/sqx/modules/artificer/dao/OrdersDao.java index 98e583a..6a07461 100644 --- a/src/main/java/com/sqx/modules/artificer/dao/OrdersDao.java +++ b/src/main/java/com/sqx/modules/artificer/dao/OrdersDao.java @@ -112,6 +112,8 @@ public interface OrdersDao extends BaseMapper { String selectOrdersCurrentPeriodRechargeSum(Long artificerId, String endDate, String startDate,@Param("isSfwc") Integer isSfwc); + BigDecimal selectOrdersCurrentPeriodRechargeMoneySum(Long artificerId, String endDate, String startDate); + BigDecimal selectOrdersRechargeMoney(Long artificerId, String endDate, String startDate); String selectOrdersStoredValueIntegral(Long artificerId, String endDate, String startDate); diff --git a/src/main/java/com/sqx/modules/artificer/entity/UserRecharge.java b/src/main/java/com/sqx/modules/artificer/entity/UserRecharge.java index 3ee247a..9297080 100644 --- a/src/main/java/com/sqx/modules/artificer/entity/UserRecharge.java +++ b/src/main/java/com/sqx/modules/artificer/entity/UserRecharge.java @@ -51,4 +51,6 @@ public class UserRecharge implements Serializable { @TableField(exist = false) private List children; + private BigDecimal money; + } diff --git a/src/main/java/com/sqx/modules/artificer/service/ArtificerTimeService.java b/src/main/java/com/sqx/modules/artificer/service/ArtificerTimeService.java index ab8484a..45737be 100644 --- a/src/main/java/com/sqx/modules/artificer/service/ArtificerTimeService.java +++ b/src/main/java/com/sqx/modules/artificer/service/ArtificerTimeService.java @@ -17,6 +17,10 @@ public interface ArtificerTimeService extends IService { Result setArtificerTime(String idleTime,String busyTime,Long artificerId); + Result setArtificerJdTime(String idleTime,Long artificerId); + + Result setArtificerBjdTime(String busyTime,Long artificerId); + Result setArtificerAccept(Integer flag,Long artificerId); } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java index f7b0e21..c64c8d3 100644 --- a/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java +++ b/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java @@ -759,7 +759,10 @@ public class ArtificerServiceImpl extends ServiceImpl i by = 11; break; case 7: - by = 11; + by = 13; + break; + case 8: + by = 15; break; } }else{ @@ -785,6 +788,9 @@ public class ArtificerServiceImpl extends ServiceImpl i case 7: by = 14; break; + case 8: + by = 16; + break; } } } @@ -1005,6 +1011,9 @@ public class ArtificerServiceImpl extends ServiceImpl i BigDecimal clockRate = num.divide(currentPeriodOrdersSumBig, 2, BigDecimal.ROUND_HALF_UP); clockRate = clockRate.multiply(cy100); earnings = clockRate.intValue()+"%"; + //加钟总金额 + BigDecimal zje = ordersDao.selectOrdersArtificerAddMoney(userId, endTime, startTime); + map.put("totalMoney",zje); System.out.println(currentPeriodOrdersSumBig+"=========="+num+"---"+clockRate); }else if(orderType == 3){//3充值 ordersIPage = ordersDao.getChongzhiList(pages, userId,isSfwc,startTime,endTime); @@ -1014,6 +1023,9 @@ public class ArtificerServiceImpl extends ServiceImpl i BigDecimal divide1 = c.divide(currentPeriodOrdersSumBig, 2, BigDecimal.ROUND_HALF_UP); divide1 = divide1.multiply(cy100); earnings = divide1.intValue()+"%"; + //充值总金额 + BigDecimal zje = ordersDao.selectOrdersCurrentPeriodRechargeMoneySum(userId, endTime, startTime); + map.put("totalMoney",zje); System.out.println(currentPeriodOrdersSumBig+"=========="+c+"---"+divide1); }else if(orderType == 4){//业绩 // ordersIPage = ordersDao.getDangqiList(pages, userId,isSfwc,startTime,endTime); diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerTimeServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerTimeServiceImpl.java index d7c30e4..362bff8 100644 --- a/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerTimeServiceImpl.java +++ b/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerTimeServiceImpl.java @@ -139,7 +139,7 @@ public class ArtificerTimeServiceImpl extends ServiceImpl dateMap = getIdelMap(idelTimes[0],idelTimes[1]); + Map dateMap = getIdelMap(startDay,startTime,endDay,endTime); Map busyMap = getBusyMap(dateMap); for (String key : busyMap.keySet()) { @@ -178,23 +178,105 @@ public class ArtificerTimeServiceImpl extends ServiceImpl getIdelMap(String startDateStr,String endDateStr){ - Map map = new HashMap(); - Date startDate = DateUtils.stringToDate(startDateStr,"yyyy-MM-dd HH:mm"); - Date endDate = DateUtils.stringToDate(endDateStr,"yyyy-MM-dd HH:mm"); - Date current = startDate; - while(current.getTime()<=endDate.getTime()){ - String day = DateUtils.format(current,"yyyy-MM-dd"); - String time = DateUtils.format(current,"HH:mm"); - if(map.get(day)!=null){ - List timeList = map.get(day); - timeList.add(time); - }else{ - List timeList = new ArrayList<>(); - timeList.add(time); - map.put(day,timeList); + @Override + public Result setArtificerJdTime(String idleTime,Long artificerId){ + Artificer artificer = artificerService.getById(artificerId); + if(StringUtils.isNotEmpty(idleTime)){ + String[] idelTimes = idleTime.split(","); + String[] datetime1 = idelTimes[0].split(" "); + String startDay = DateUtils.format(new Date(),DateUtils.DATE_PATTERN); +// String startDay = datetime1[0]; + String startTime = datetime1[1]; + String[] datetime2 = idelTimes[1].split(" "); + Date date = DateUtils.stringToDate(startDay,DateUtils.DATE_PATTERN); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + calendar.add(Calendar.DAY_OF_MONTH, 3); + String endDay = DateUtils.format(calendar.getTime(),DateUtils.DATE_PATTERN); +// String endDay = datetime2[0]; + String endTime = datetime2[1]; + baseMapper.deleteTime(artificer.getArtificerId(),startDay,startTime,endDay,endTime); + + QueryWrapper qwi = new QueryWrapper(); + qwi.eq("artificer_id", artificer.getArtificerId()); + artificerTimeIdelDao.delete(qwi); + + ArtificerTimeIdel ati = new ArtificerTimeIdel(); + ati.setArtificerId(artificer.getArtificerId()); + ati.setStartTime(startTime); + ati.setEndTime(endTime); + ati.setCreateTime(DateUtils.format(new Date())); + artificerTimeIdelDao.insert(ati); + + Map dateMap = getIdelMap(startDay,startTime,endDay,endTime); + + Map busyMap = getBusyMap(dateMap); + for (String key : busyMap.keySet()) { + List busyTimeList = busyMap.get(key); + for(String time : busyTimeList){ + Integer counts = baseMapper.selectCount(new QueryWrapper().eq("artificer_date", key).eq("artificer_id", artificer.getArtificerId()).eq("artificer_time", time)); + if(counts==0){ + ArtificerTime artificerTime=new ArtificerTime(); + artificerTime.setArtificerDate(key); + artificerTime.setArtificerTime(time); + artificerTime.setArtificerId(artificer.getArtificerId()); + artificerTime.setClassify(2); + artificerTime.setCreateTime(DateUtils.format(new Date())); + baseMapper.insert(artificerTime); + } + } } - current = DateUtils.addDateMinutes(current,30); + } + return Result.success(); + } + + @Override + public Result setArtificerBjdTime(String busyTime,Long artificerId){ + Artificer artificer = artificerService.getById(artificerId); + if(StringUtils.isNotEmpty(busyTime)){ + for(String times:busyTime.split(",")){ + String[] datetime = times.split(" "); + if(datetime!=null && datetime.length>0){ + Integer counts = baseMapper.selectCount(new QueryWrapper().eq("artificer_date", datetime[0]).eq("artificer_id", artificer.getArtificerId()).eq("artificer_time", datetime[1])); + if(counts==0){ + ArtificerTime artificerTime=new ArtificerTime(); + artificerTime.setArtificerDate(datetime[0]); + artificerTime.setArtificerTime(datetime[1]); + artificerTime.setArtificerId(artificer.getArtificerId()); + artificerTime.setClassify(2); + artificerTime.setCreateTime(DateUtils.format(new Date())); + baseMapper.insert(artificerTime); + } + } + } + } + return Result.success(); + } + +// private Map getIdelMap(String startDateStr,String endDateStr){ + private Map getIdelMap(String startDayStr,String startTimeStr,String endDayStr,String endTimeStr){ + Map map = new HashMap(); + Date startDate = DateUtils.stringToDate(startDayStr,"yyyy-MM-dd"); + Date endDate = DateUtils.stringToDate(endDayStr,"yyyy-MM-dd"); + Date startTime = DateUtils.stringToDate(startTimeStr,"HH:mm"); + Date endTime = DateUtils.stringToDate(endTimeStr,"HH:mm"); + Date currentDate = startDate; + while(currentDate.getTime()<=endDate.getTime()){ + String day = DateUtils.format(currentDate,"yyyy-MM-dd"); + Date currentTime = startTime; + while(currentTime.getTime()<=endTime.getTime()){ + String time = DateUtils.format(currentTime,"HH:mm"); + if(map.get(day)!=null){ + List timeList = map.get(day); + timeList.add(time); + }else{ + List timeList = new ArrayList<>(); + timeList.add(time); + map.put(day,timeList); + } + currentTime = DateUtils.addDateMinutes(currentTime,30); + } + currentDate = DateUtils.addDateDays(currentDate,1); } return map; } diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java index 24078ea..de7308c 100644 --- a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java +++ b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java @@ -7836,13 +7836,13 @@ public class OrdersServiceImpl extends ServiceImpl implements MessageInfo messageInfo = new MessageInfo(); messageInfo.setState("8"); messageInfo.setUserId(String.valueOf(artificer.getUserId())); - messageInfo.setTitle("系统修改信誉分"); + messageInfo.setTitle("系统修改信用积分"); if (type == 1) { newCreditScore = artificer.getCreditScore().add(creditScore); - messageInfo.setContent("增加信誉分：" + creditScore); + messageInfo.setContent("增加信用积分：" + creditScore); } else { newCreditScore = artificer.getCreditScore().subtract(creditScore); - messageInfo.setContent("扣除信誉分：" + creditScore); + messageInfo.setContent("扣除信用积分：" + creditScore); } artificer.setCreditScore(newCreditScore); String value = commonInfoService.findOne(385).getValue(); diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/RealNameServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/RealNameServiceImpl.java index c095c41..625458d 100644 --- a/src/main/java/com/sqx/modules/artificer/service/impl/RealNameServiceImpl.java +++ b/src/main/java/com/sqx/modules/artificer/service/impl/RealNameServiceImpl.java @@ -193,40 +193,48 @@ public class RealNameServiceImpl extends ServiceImpl Artificer artificer = artificerService.selectArtificerByUserId(certification1.getUserId()); if(artificer==null){ artificer=new Artificer(); - }else { - return Result.error("该技师已存在"); - } - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - artificer.setUserId(certification1.getUserId()); - artificer.setCreateTime(sdf.format(new Date())); - artificer.setArtificerSales(0); - artificer.setStatus(2); - artificer.setArtificerName(certification1.getName()); - artificer.setArtificerImg(certification1.getAvatar()); - artificer.setLifePhoto(certification1.getImagePhoto()); - artificer.setCertificate(certification1.getCertification()); - artificer.setContent(certification1.getIndividualResume()); - artificer.setClassifyId(certification1.getClassifyId()); - artificer.setCreditScore(BigDecimal.valueOf(100)); - artificer.setTripWay(1); - if(agency!=null){ - artificer.setCity(agency.getCity()); - }else{ - artificer.setCity("长春市"); - } - if(artificer.getArtificerId()!=null){ - artificerService.updateById(artificer); - }else{ - artificer.setRate(new BigDecimal(commonInfoService.findOne(381).getValue())); - artificerService.save(artificer); - } + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + artificer.setUserId(certification1.getUserId()); + artificer.setCreateTime(sdf.format(new Date())); + artificer.setArtificerSales(0); + artificer.setStatus(2); + artificer.setArtificerName(certification1.getName()); + artificer.setArtificerImg(certification1.getAvatar()); + artificer.setLifePhoto(certification1.getImagePhoto()); + artificer.setCertificate(certification1.getCertification()); + artificer.setContent(certification1.getIndividualResume()); + artificer.setClassifyId(certification1.getClassifyId()); + artificer.setCreditScore(BigDecimal.valueOf(100)); + artificer.setTripWay(1); + if(agency!=null){ + artificer.setCity(agency.getCity()); + }else{ + artificer.setCity("长春市"); + } + if(artificer.getArtificerId()!=null){ + artificerService.updateById(artificer); + }else{ + artificer.setRate(new BigDecimal(commonInfoService.findOne(381).getValue())); + artificerService.save(artificer); + } - UserEntity userEntity = userService.selectUserById(artificer.getUserId()); - userEntity.setIsAuthentication(2); + UserEntity userEntity = userService.selectUserById(artificer.getUserId()); + userEntity.setIsAuthentication(2); + userService.updateById(userEntity); + }else { + UserEntity userEntity = userService.selectUserById(certification1.getUserId()); + userEntity.setIsAuthentication(2); + userEntity.setStatus(1); + userService.updateById(userEntity); + } + }else if(certification1.getStatus()==2){ + UserEntity userEntity = userService.selectUserById(certification1.getUserId()); + userEntity.setIsAuthentication(3); userService.updateById(userEntity); }else{ UserEntity userEntity = userService.selectUserById(certification1.getUserId()); - userEntity.setIsAuthentication(3); + userEntity.setIsAuthentication(1); + userEntity.setStatus(2); userService.updateById(userEntity); } return Result.success(); diff --git a/src/main/java/com/sqx/modules/common/enums/CommonEnum.java b/src/main/java/com/sqx/modules/common/enums/CommonEnum.java index 7e0dd4d..e06a08a 100644 --- a/src/main/java/com/sqx/modules/common/enums/CommonEnum.java +++ b/src/main/java/com/sqx/modules/common/enums/CommonEnum.java @@ -36,9 +36,9 @@ public enum CommonEnum { /**夜间时段从n开始~n结束(留空自动计算)*/ V3_TRAVEL_CONF_NIGHT(446, "v3_travel_conf", "夜间时段从n开始~n结束(留空自动计算)", ","), - V3_TRAVEL_CONF_IS_PRICING(447, "v3_travel_conf", "出行配置使用动态价格", "true"), + V3_TRAVEL_CONF_IS_PRICING(447, "v3_travel_conf", "出行配置使用动态价格", "true"); - V3_TRAVEL_CONF_IS_FIXED(450, "v3_travel_conf", "出行配置固定价格是否往返", "false"); +// V3_TRAVEL_CONF_IS_FIXED(450, "v3_travel_conf", "出行配置固定价格是否往返", "false"); private final Integer key; @@ -132,8 +132,8 @@ public enum CommonEnum { V3_TRAVEL_CONF_WINTER_TIME.getKey(), V3_TRAVEL_CONF_DAY.getKey(), V3_TRAVEL_CONF_NIGHT.getKey(), - V3_TRAVEL_CONF_IS_PRICING.getKey(), - V3_TRAVEL_CONF_IS_FIXED.getKey() + V3_TRAVEL_CONF_IS_PRICING.getKey() +// ,V3_TRAVEL_CONF_IS_FIXED.getKey() }); private final Integer[] values; diff --git a/src/main/java/com/sqx/modules/material/entity/MaterialMassage.java b/src/main/java/com/sqx/modules/material/entity/MaterialMassage.java index 379633a..1cdc796 100644 --- a/src/main/java/com/sqx/modules/material/entity/MaterialMassage.java +++ b/src/main/java/com/sqx/modules/material/entity/MaterialMassage.java @@ -4,11 +4,13 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.google.common.collect.Lists; import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; +import java.util.List; /** * 物料包与服务表中间表 @@ -37,7 +39,7 @@ public class MaterialMassage implements Serializable { /** 物料包类别（1，中医类2，精油类） */ @TableField(exist = false) - private Integer status; + private String status; /** 物料包名称 */ @TableField(exist = false) @@ -74,4 +76,7 @@ public class MaterialMassage implements Serializable { @TableField(exist = false) private static final long serialVersionUID = 1L; + + @TableField(exist = false) + private List list = Lists.newArrayList() ; } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/material/service/impl/MaterialArtificerServiceImpl.java b/src/main/java/com/sqx/modules/material/service/impl/MaterialArtificerServiceImpl.java index e0371eb..2eecb06 100644 --- a/src/main/java/com/sqx/modules/material/service/impl/MaterialArtificerServiceImpl.java +++ b/src/main/java/com/sqx/modules/material/service/impl/MaterialArtificerServiceImpl.java @@ -53,6 +53,7 @@ public class MaterialArtificerServiceImpl extends ServiceImpl0){ return Result.error("该物料包已被添加，请重新选择"); } + materialArtificer.setResidue(BigDecimal.ZERO); int result = baseMapper.insert(materialArtificer); return Result.success(String.valueOf(result)); } diff --git a/src/main/java/com/sqx/modules/material/service/impl/MaterialServiceImpl.java b/src/main/java/com/sqx/modules/material/service/impl/MaterialServiceImpl.java index 625aace..520fe0d 100644 --- a/src/main/java/com/sqx/modules/material/service/impl/MaterialServiceImpl.java +++ b/src/main/java/com/sqx/modules/material/service/impl/MaterialServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.google.common.collect.Lists; import com.sqx.common.utils.Result; import com.sqx.modules.artificer.dao.OrdersDao; import com.sqx.modules.artificer.entity.Orders; @@ -188,6 +189,16 @@ public class MaterialServiceImpl extends ServiceImpl i @Override public Result selectMaterialMassage(Integer page, Integer limit, MaterialMassage materialMassage) { IPage page1 = new Page(page, limit); + String status = materialMassage.getStatus(); + String[] ss = status.split(","); + List list = null; + if(ss.length>0){ + list = Lists.newArrayList(); + for(int i=0;i materialIPage = materialMapper.selectMaterialMassage(page1,materialMassage); return Result.success().put("data", materialIPage); } diff --git a/src/main/java/com/sqx/modules/message/controller/MessageController.java b/src/main/java/com/sqx/modules/message/controller/MessageController.java index cc3f239..64386eb 100644 --- a/src/main/java/com/sqx/modules/message/controller/MessageController.java +++ b/src/main/java/com/sqx/modules/message/controller/MessageController.java @@ -184,10 +184,15 @@ public class MessageController { } @GetMapping("/selectArtificerScoreList") - @ApiOperation("查询技师信誉分明细") + @ApiOperation("查询技师信用积分明细") public Result selectArtificerScoreList(Integer page,Integer limit,Long userId,String phone,String artificerName){ return messageService.selectArtificerScoreList(page, limit, artificerName, phone, userId); } + @GetMapping("/selectArtificerList") + @ApiOperation("查询技师信用积分") + public Result selectArtificerList(Integer page,Integer limit,String phone,String artificerName){ + return messageService.selectArtificerList(page, limit, artificerName, phone); + } } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/message/dao/MessageInfoDao.java b/src/main/java/com/sqx/modules/message/dao/MessageInfoDao.java index ca66f45..cf72096 100644 --- a/src/main/java/com/sqx/modules/message/dao/MessageInfoDao.java +++ b/src/main/java/com/sqx/modules/message/dao/MessageInfoDao.java @@ -27,5 +27,7 @@ public interface MessageInfoDao extends BaseMapper { IPage> selectArtificerScoreList(Page> page,String artificerName,String phone,Long userId); + IPage> selectArtificerList(Page> page,String artificerName,String phone); + } diff --git a/src/main/java/com/sqx/modules/message/service/MessageService.java b/src/main/java/com/sqx/modules/message/service/MessageService.java index c2b7005..4658d1d 100644 --- a/src/main/java/com/sqx/modules/message/service/MessageService.java +++ b/src/main/java/com/sqx/modules/message/service/MessageService.java @@ -42,6 +42,8 @@ public interface MessageService extends IService { Result selectArtificerScoreList(Integer page,Integer limit,String artificerName,String phone,Long userId); + Result selectArtificerList(Integer page,Integer limit,String artificerName,String phone); + void sendNoticeByCall(Long userId); } diff --git a/src/main/java/com/sqx/modules/message/service/impl/MessageServiceImpl.java b/src/main/java/com/sqx/modules/message/service/impl/MessageServiceImpl.java index bf5da5d..bf8ac57 100644 --- a/src/main/java/com/sqx/modules/message/service/impl/MessageServiceImpl.java +++ b/src/main/java/com/sqx/modules/message/service/impl/MessageServiceImpl.java @@ -257,6 +257,17 @@ public class MessageServiceImpl extends return Result.success().put("data",new PageUtils(baseMapper.selectArtificerScoreList(new Page<>(page,limit),artificerName,phone,userId))); } + @Override + public Result selectArtificerList(Integer page,Integer limit,String artificerName,String phone){ + Map result = new HashMap(); + result.put("data", new PageUtils(baseMapper.selectArtificerList(new Page<>(page,limit),artificerName,phone))); + String value1 = commonInfoService.findOne(384).getValue(); + String value2 = commonInfoService.findOne(385).getValue(); + String remarks = "技师每被投诉一次扣1点信用积分，每取消一次订单扣"+value1+"点信用积分，当积分不足"+value2+"时停盘处理。每季度1号恢复回信用积分100点。"; + result.put("remarks", remarks); + return Result.success().put("data",result); + } + @Override public void sendNoticeByCall(Long userId){ //技师电话通知业务 diff --git a/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java b/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java index b870b10..f6ee7ed 100644 --- a/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java +++ b/src/main/java/com/sqx/modules/pay/controller/app/AliPayController.java @@ -1173,6 +1173,7 @@ public class AliPayController { o.setArtificerId(payDetails.getArtificerId()); o.setOrdersId(payDetails.getMassageOrdersId()); o.setCreateTime(DateUtils.format(new Date())); + o.setMoney(payClassify.getMoney()); userRechargeDao.insert(o); ArtificerIntegralStatistics ais = new ArtificerIntegralStatistics(); diff --git a/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java b/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java index a5c1cf6..fa3cef1 100644 --- a/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java +++ b/src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java @@ -3256,6 +3256,7 @@ public class WxServiceImpl implements WxService { o.setArtificerId(payDetails.getArtificerId()); o.setOrdersId(payDetails.getMassageOrdersId()); o.setCreateTime(DateUtils.format(new Date())); + o.setMoney(payClassify.getMoney()); userRechargeDao.insert(o); ArtificerIntegralStatistics ais = new ArtificerIntegralStatistics(); diff --git a/src/main/java/com/sqx/modules/task/service/impl/AllTaskServiceImpl.java b/src/main/java/com/sqx/modules/task/service/impl/AllTaskServiceImpl.java index d13e6c2..09edd56 100644 --- a/src/main/java/com/sqx/modules/task/service/impl/AllTaskServiceImpl.java +++ b/src/main/java/com/sqx/modules/task/service/impl/AllTaskServiceImpl.java @@ -407,7 +407,10 @@ public class AllTaskServiceImpl implements AllTaskSercice { //技师每天闲时配置 @Scheduled(cron = "10 00 0 * * ?") public void setArtificerTime() { - String curDate = DateUtils.format(new Date(),DateUtils.DATE_PATTERN); + Calendar calendar = Calendar.getInstance(); + String startDate = DateUtils.format(calendar.getTime(),DateUtils.DATE_PATTERN); + calendar.add(Calendar.DAY_OF_MONTH, 3); + String endDate = DateUtils.format(calendar.getTime(),DateUtils.DATE_PATTERN); QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.apply("id in ( select max(id) from artificer_time_idel b group by artificer_id )"); List artificerTimeIdelList = artificerTimeIdelDao.selectList(queryWrapper); @@ -416,7 +419,8 @@ public class AllTaskServiceImpl implements AllTaskSercice { String startTime = ati.getStartTime(); String endTime = ati.getEndTime(); Long artificerId = ati.getArtificerId(); - Map dateMap = getIdelMap(curDate+" "+startTime,curDate+" "+endTime); +// Map dateMap = getIdelMap(startDate+" "+startTime,endDate+" "+endTime); + Map dateMap = getIdelMap(startDate,startTime,endDate,endTime); Map busyMap = getBusyMap(dateMap); for (String key : busyMap.keySet()) { List busyTimeList = busyMap.get(key); @@ -436,23 +440,30 @@ public class AllTaskServiceImpl implements AllTaskSercice { } } - private Map getIdelMap(String startDateStr, String endDateStr){ +// private Map getIdelMap(String startDateStr, String endDateStr){ + private Map getIdelMap(String startDayStr,String startTimeStr,String endDayStr,String endTimeStr){ Map map = new HashMap(); - Date startDate = DateUtils.stringToDate(startDateStr,"yyyy-MM-dd HH:mm"); - Date endDate = DateUtils.stringToDate(endDateStr,"yyyy-MM-dd HH:mm"); - Date current = startDate; - while(current.getTime()<=endDate.getTime()){ - String day = DateUtils.format(current,"yyyy-MM-dd"); - String time = DateUtils.format(current,"HH:mm"); - if(map.get(day)!=null){ - List timeList = map.get(day); - timeList.add(time); - }else{ - List timeList = new ArrayList<>(); - timeList.add(time); - map.put(day,timeList); + Date startDate = DateUtils.stringToDate(startDayStr,"yyyy-MM-dd"); + Date endDate = DateUtils.stringToDate(endDayStr,"yyyy-MM-dd"); + Date startTime = DateUtils.stringToDate(startTimeStr,"HH:mm"); + Date endTime = DateUtils.stringToDate(endTimeStr,"HH:mm"); + Date currentDate = startDate; + while(currentDate.getTime()<=endDate.getTime()){ + String day = DateUtils.format(currentDate,"yyyy-MM-dd"); + Date currentTime = startTime; + while(currentTime.getTime()<=endTime.getTime()){ + String time = DateUtils.format(currentTime,"HH:mm"); + if(map.get(day)!=null){ + List timeList = map.get(day); + timeList.add(time); + }else{ + List timeList = new ArrayList<>(); + timeList.add(time); + map.put(day,timeList); + } + currentTime = DateUtils.addDateMinutes(currentTime,30); } - current = DateUtils.addDateMinutes(current,30); + currentDate = DateUtils.addDateDays(currentDate,1); } return map; } diff --git a/src/main/java/com/sqx/modules/travelconf/service/TravelConfService.java b/src/main/java/com/sqx/modules/travelconf/service/TravelConfService.java index 280d227..40447da 100644 --- a/src/main/java/com/sqx/modules/travelconf/service/TravelConfService.java +++ b/src/main/java/com/sqx/modules/travelconf/service/TravelConfService.java @@ -26,7 +26,7 @@ public interface TravelConfService extends IService { * @param timeIntervalType 时段(1:白天,2:夜间) * @return 配置对象 */ - TravelConf getConfByAccordingCondition(Integer pricingType, Integer travelType, Integer seasonsType, Integer timeIntervalType, Integer fixedType); + TravelConf getConfByAccordingCondition(Integer pricingType, Integer travelType, Integer seasonsType, Integer timeIntervalType); /** * 按ID获取出行价格 diff --git a/src/main/java/com/sqx/modules/travelconf/service/impl/TravelConfServiceImpl.java b/src/main/java/com/sqx/modules/travelconf/service/impl/TravelConfServiceImpl.java index 7adb274..c0206d7 100644 --- a/src/main/java/com/sqx/modules/travelconf/service/impl/TravelConfServiceImpl.java +++ b/src/main/java/com/sqx/modules/travelconf/service/impl/TravelConfServiceImpl.java @@ -69,14 +69,14 @@ public class TravelConfServiceImpl extends ServiceImpl qw = new QueryWrapper<>(); //价格类型 qw.lambda().eq(pricingType != null, TravelConf::getPricingType, pricingType); //出行方式 qw.lambda().eq(travelType != null, TravelConf::getTravelType, travelType); - //往返类型 - qw.lambda().eq(fixedType != null, TravelConf::getFixedType, fixedType); //时令 qw.lambda().eq(seasonsType != null, TravelConf::getSeasonsType, seasonsType); //时段 @@ -260,6 +255,11 @@ public class TravelConfServiceImpl extends ServiceImpl免费公里数：公里数-免费公里数<起步公里数时，车费=夜间出行费+起步价 - if(kilometers.compareTo(startKilometers)<0){ + if(kilometers.compareTo(startKilometers)<=0){ + startingPrice = fixedFactor.multiply(startingPrice); startingPrice = startingPrice.setScale(2,BigDecimal.ROUND_HALF_UP); }else{ //公里数>免费公里数：公里数-免费公里数>起步公里数时，车费=夜间出行费+起步价+(公里数-免费公里数-起步公里数)*每公里价格 startingPrice = startingPrice.add(kilometers.subtract(startKilometers).multiply(pricePerKilometer)); + startingPrice = fixedFactor.multiply(startingPrice); startingPrice = startingPrice.setScale(2,BigDecimal.ROUND_HALF_UP); } vo.setUsualTravelMoney(startingPrice); diff --git a/src/main/java/com/sqx/modules/utils/AppNotifyUtil.java b/src/main/java/com/sqx/modules/utils/AppNotifyUtil.java index 17b9dac..d0171bf 100644 --- a/src/main/java/com/sqx/modules/utils/AppNotifyUtil.java +++ b/src/main/java/com/sqx/modules/utils/AppNotifyUtil.java @@ -16,7 +16,7 @@ public class AppNotifyUtil { /*用户接收回执的服务器地址*/ message.setCallbackUrl(""); message.setCalleeNumber(calleeNumber); - message.setReplayTimes(1); + message.setReplayTimes(2); /*设置平台分配的模板ID*/ message.setTemplateId(templateId); LinkedHashMap params = new LinkedHashMap(); diff --git a/src/main/resources/mapper/artificer/ArtificerTimeDao.xml b/src/main/resources/mapper/artificer/ArtificerTimeDao.xml index feddd71..8f16343 100644 --- a/src/main/resources/mapper/artificer/ArtificerTimeDao.xml +++ b/src/main/resources/mapper/artificer/ArtificerTimeDao.xml @@ -7,8 +7,8 @@ delete from artificer_time where classify = 2 and artificer_id = #{artificerId} - and date_format(concat(artificer_date,' ',artificer_time),'%Y-%m-%d %H:%i') >= date_format(concat(#{startDay},' ',#{startTime}),'%Y-%m-%d %H:%i') - and date_format(concat(artificer_date,' ',artificer_time) ,'%Y-%m-%d %H:%i') <= date_format(concat(#{endDay},' ',#{endTime}),'%Y-%m-%d %H:%i') + and date_format(artificer_date,'%Y-%m-%d') >= date_format(#{startDay},'%Y-%m-%d') + and date_format(artificer_date,'%Y-%m-%d') <= date_format(#{endDay},'%Y-%m-%d') \ No newline at end of file diff --git a/src/main/resources/mapper/artificer/OrdersDao.xml b/src/main/resources/mapper/artificer/OrdersDao.xml index f20dd26..368e252 100644 --- a/src/main/resources/mapper/artificer/OrdersDao.xml +++ b/src/main/resources/mapper/artificer/OrdersDao.xml @@ -1403,7 +1403,7 @@ - + + + + + diff --git a/src/main/resources/mapper/message/MessageInfoDao.xml b/src/main/resources/mapper/message/MessageInfoDao.xml index 8fe4dd0..40dbd37 100644 --- a/src/main/resources/mapper/message/MessageInfoDao.xml +++ b/src/main/resources/mapper/message/MessageInfoDao.xml @@ -75,5 +75,22 @@ order by m.create_at desc + + \ No newline at end of file