diff --git a/hiver-core/src/main/java/cc/hiver/core/dao/UserDao.java b/hiver-core/src/main/java/cc/hiver/core/dao/UserDao.java
index 5847ccfe..61a762f3 100644
--- a/hiver-core/src/main/java/cc/hiver/core/dao/UserDao.java
+++ b/hiver-core/src/main/java/cc/hiver/core/dao/UserDao.java
@@ -119,6 +119,10 @@ public interface UserDao extends HiverBaseDao
{
@Query("update User u set u.mobile=?1 where u.id=?2")
void updateUserPhoneById(String userPhone, String userId);
+ @Modifying
+ @Query("update User u set u.nickname=?2, u.avatar=?3 where u.id=?1")
+ int updateMiniProfile(String userId, String nickname, String avatar);
+
@Modifying
@Query(value = "update t_user set saved_amount = coalesce(saved_amount, 0) + ?2 where id = ?1", nativeQuery = true)
int increaseSavedAmount(String userId, BigDecimal savedAmount);
diff --git a/hiver-core/src/main/java/cc/hiver/core/dao/WorkerDao.java b/hiver-core/src/main/java/cc/hiver/core/dao/WorkerDao.java
index 4264f859..1284d127 100644
--- a/hiver-core/src/main/java/cc/hiver/core/dao/WorkerDao.java
+++ b/hiver-core/src/main/java/cc/hiver/core/dao/WorkerDao.java
@@ -23,6 +23,10 @@ public interface WorkerDao extends HiverBaseDao {
@Query("update Worker w set w.isOnLine=?2 where w.workerId=?1")
void changeOnLine(String id, Integer onLine);
+ @Modifying
+ @Query("update Worker w set w.isFullTime=?2 where w.workerId=?1")
+ void changeFullTime(String id, Integer isFullTime);
+
@Modifying
@Query("update Worker w set w.workerStatus=?2 where w.workerId = ?1")
void delById(String id, Integer workerStatusDisable);
diff --git a/hiver-core/src/main/java/cc/hiver/core/entity/Worker.java b/hiver-core/src/main/java/cc/hiver/core/entity/Worker.java
index 3bc7ddea..ff430643 100644
--- a/hiver-core/src/main/java/cc/hiver/core/entity/Worker.java
+++ b/hiver-core/src/main/java/cc/hiver/core/entity/Worker.java
@@ -199,6 +199,10 @@ public class Worker implements Serializable {
@Column(name = "get_push_order")
private Integer getPushOrder;
+ @ApiModelProperty(value = "是否全职配送员：0否 1是")
+ @Column(name = "is_full_time")
+ private Integer isFullTime = 0;
+
@ApiModelProperty(value = "评分")
@Column(name = "score")
private BigDecimal score;
diff --git a/hiver-core/src/main/java/cc/hiver/core/service/UserService.java b/hiver-core/src/main/java/cc/hiver/core/service/UserService.java
index 65d61a48..8b582b47 100644
--- a/hiver-core/src/main/java/cc/hiver/core/service/UserService.java
+++ b/hiver-core/src/main/java/cc/hiver/core/service/UserService.java
@@ -146,6 +146,8 @@ public interface UserService extends HiverBaseService {
void updateUserPhoneById(String userPhone, String userId);
+ int updateMiniProfile(String userId, String nickname, String avatar);
+
/**
* 判断指定用户是否已完成平台实名认证。
*
diff --git a/hiver-core/src/main/java/cc/hiver/core/service/WorkerService.java b/hiver-core/src/main/java/cc/hiver/core/service/WorkerService.java
index 497cbf92..c0d71375 100644
--- a/hiver-core/src/main/java/cc/hiver/core/service/WorkerService.java
+++ b/hiver-core/src/main/java/cc/hiver/core/service/WorkerService.java
@@ -54,6 +54,8 @@ public interface WorkerService extends HiverBaseService {
*/
void offLine(String id);
+ void changeFullTime(String id, Integer isFullTime);
+
/**
* 删除（修改为禁用状态）
*
diff --git a/hiver-core/src/main/java/cc/hiver/core/serviceimpl/UserServiceImpl.java b/hiver-core/src/main/java/cc/hiver/core/serviceimpl/UserServiceImpl.java
index 723d2944..fef22566 100644
--- a/hiver-core/src/main/java/cc/hiver/core/serviceimpl/UserServiceImpl.java
+++ b/hiver-core/src/main/java/cc/hiver/core/serviceimpl/UserServiceImpl.java
@@ -369,6 +369,11 @@ public class UserServiceImpl implements UserService {
userDao.updateUserPhoneById(userPhone, userId);
}
+ @Override
+ public int updateMiniProfile(String userId, String nickname, String avatar) {
+ return userDao.updateMiniProfile(userId, nickname, avatar);
+ }
+
@Override
public boolean isRealNameVerified(String userId) {
if (CharSequenceUtil.isBlank(userId)) {
diff --git a/hiver-core/src/main/java/cc/hiver/core/serviceimpl/WorkerServiceImpl.java b/hiver-core/src/main/java/cc/hiver/core/serviceimpl/WorkerServiceImpl.java
index f6f38a98..b7e74f94 100644
--- a/hiver-core/src/main/java/cc/hiver/core/serviceimpl/WorkerServiceImpl.java
+++ b/hiver-core/src/main/java/cc/hiver/core/serviceimpl/WorkerServiceImpl.java
@@ -248,6 +248,11 @@ public class WorkerServiceImpl implements WorkerService {
workerDao.changeOnLine(id, CommonConstant.OFF_LINE);
}
+ @Override
+ public void changeFullTime(String id, Integer isFullTime) {
+ workerDao.changeFullTime(id, isFullTime);
+ }
+
/**
* 删除（修改为禁用状态）
*
diff --git a/hiver-modules/hiver-base/src/main/java/cc/hiver/base/controller/manage/AuthController.java b/hiver-modules/hiver-base/src/main/java/cc/hiver/base/controller/manage/AuthController.java
index f1bcf7eb..a6490f05 100644
--- a/hiver-modules/hiver-base/src/main/java/cc/hiver/base/controller/manage/AuthController.java
+++ b/hiver-modules/hiver-base/src/main/java/cc/hiver/base/controller/manage/AuthController.java
@@ -201,7 +201,7 @@ public class AuthController {
}
Worker worker = workerService.findByUserId(user.getId());
//更新配送员 推送id
- if(worker!= null){
+ if(worker!= null && StringUtils.isNotEmpty(clientId)){
worker.setClientId(clientId);
workerService.update(worker);
String oldRegion = worker.getRegion();
@@ -247,8 +247,9 @@ public class AuthController {
@RequestMapping(value = "/smsLogin", method = RequestMethod.POST)
@SystemLog(description = "短信登录", type = LogType.LOGIN)
@ApiOperation("短信登录")
- @Transactional(readOnly = true)
+ @Transactional
public Result smsLogin(@RequestParam String mobile,
+ @RequestParam(value = "clientId", required = false) String clientId,
@RequestParam(required = false) String type,
@RequestParam(required = false) Boolean saveLogin) {
@@ -264,27 +265,73 @@ public class AuthController {
// 返回当前登录人的信息
result.put("user", user);
- // 店铺登录的话，根据登录人查询所有关联的店铺（店铺启用，并且在有效期内）
- if (UserConstant.USER_TYPE_NORMAL.equals(type)) {
- // 获取
- final List shopUsers = shopUserService.selectByUserId(user.getId());
- if (!shopUsers.isEmpty()) {
- // 获取店主手机号
- for (ShopUser shopUser : shopUsers) {
- final Shop shop = shopService.findById(shopUser.getShop().getId());
- if (shop != null && shop.getShopOwnerId() != null && StringUtils.isNotEmpty(shop.getShopOwnerId())) {
- final User shopOwner = userService.findById(shop.getShopOwnerId());
- if(shopOwner != null){
- shopUser.setShopOwnerName(shopOwner.getNickname());
- shopUser.setShopOwnerPhone(shopOwner.getMobile());
+ List shop = shopService.getShopByUserid(user.getId());
+ if(!shop.isEmpty()){
+ List shopIds = new ArrayList<>();
+ for (Shop item : shop) {
+ shopIds.add(item.getId());
+ if (StringUtils.isNotEmpty(clientId)) {
+ item.setClientId(clientId);
+ shopService.update(item);
+ shopService.refreshShopCache(item.getId(), item.getRegionId());
+ }
+ }
+ if(!shopIds.isEmpty()){
+ List shopTakeaway = shopTakeawayService.selectListByshopId(shopIds);
+ if(shopTakeaway != null){
+ shop.forEach(e -> {
+ for(ShopTakeaway shopTakeawa : shopTakeaway) {
+ if (e.getId().equals(shopTakeawa.getShopId())) {
+ e.setShopTakeaway(shopTakeawa);
+ }
}
+ });
+ }
+ }
+ result.put("shop", shop);
+ }
+ Worker worker = workerService.findByUserId(user.getId());
+ //更新配送员 推送id
+ if(worker!= null && StringUtils.isNotEmpty(clientId)){
+ worker.setClientId(clientId);
+ workerService.update(worker);
+ String oldRegion = worker.getRegion();
+ WorkerRedisVo workerRedisVo = StrUtil.isNotBlank(oldRegion) ? workerRedisCacheUtil.get(oldRegion, worker.getWorkerId()) : null;
+ if(workerRedisVo != null){
+ workerRedisVo.setWorker(worker);
+ if (Objects.equals(oldRegion, worker.getRegion())) {
+ workerRedisCacheUtil.update(worker.getRegion(), workerRedisVo);
+ } else {
+ workerRedisCacheUtil.remove(oldRegion, worker.getWorkerId());
+ if (StrUtil.isNotBlank(worker.getRegion())) {
+ workerRedisCacheUtil.put(worker.getRegion(), workerRedisVo);
}
}
- result.put("shopList", shopUsers);
- } else {
- return ResultUtil.error("店铺未开通！");
}
}
+ if(worker!= null && worker.getGetPushOrder() != null && worker.getGetPushOrder() == 1){
+ final List workerRelaPriceList = workerRelaPriceService.selectByWorkerId(worker.getWorkerId());
+ List workerRelaPriceListWaimai = new ArrayList<>();
+ List workerRelaPriceListKuaidi = new ArrayList<>();
+ if(workerRelaPriceList != null && workerRelaPriceList.size() > 0){
+ workerRelaPriceList.forEach(workerRelaPrice -> {
+ if(workerRelaPrice.getGetPushOrder() == 1){
+ if(workerRelaPrice.getOrderType() == 0 ){
+ workerRelaPriceListWaimai.add(workerRelaPrice);
+ }else{
+ workerRelaPriceListKuaidi.add(workerRelaPrice);
+ }
+ }
+ });
+ }
+ if(workerRelaPriceListWaimai.size() > 0){
+ result.put("waimaiData", workerRelaPriceListWaimai);
+ }
+ if(workerRelaPriceListKuaidi.size() > 0){
+ result.put("kuaidiData", workerRelaPriceListKuaidi);
+ }
+ }
+ result.put("worker", worker);
return ResultUtil.data(result);
}
diff --git a/hiver-modules/hiver-base/src/main/java/cc/hiver/base/controller/manage/UserController.java b/hiver-modules/hiver-base/src/main/java/cc/hiver/base/controller/manage/UserController.java
index 01cf7a64..89b9e1eb 100644
--- a/hiver-modules/hiver-base/src/main/java/cc/hiver/base/controller/manage/UserController.java
+++ b/hiver-modules/hiver-base/src/main/java/cc/hiver/base/controller/manage/UserController.java
@@ -179,6 +179,53 @@ public class UserController {
return ResultUtil.success("修改成功");
}
+ @RequestMapping(value = "/profile", method = RequestMethod.POST)
+ @ApiOperation(value = "小程序修改头像昵称", notes = "头像和昵称来自微信头像昵称填写能力，微信侧已完成安全检测")
+ public Result updateMiniProfile(@RequestBody Map body) {
+ final User old = securityUtil.getCurrUser();
+ String nickname = body == null ? "" : StringUtils.trimToEmpty(body.get("nickname"));
+ String avatar = body == null ? "" : StringUtils.trimToEmpty(body.get("avatar"));
+ if (StringUtils.isBlank(nickname)) {
+ return ResultUtil.error("昵称不能为空");
+ }
+ if (nickname.length() > 20) {
+ return ResultUtil.error("昵称长度不能超过20");
+ }
+
+ old.setNickname(nickname);
+ if (StringUtils.isNotBlank(avatar)) {
+ old.setAvatar(avatar);
+ }
+ userService.update(old);
+ entityManager.detach(old);
+ old.setPassword(null);
+ return new ResultUtil().setData(old);
+ }
+
+ @RequestMapping(value = "/miniProfile", method = RequestMethod.POST)
+ @ApiOperation(value = "小程序只修改头像昵称", notes = "仅更新user表nickname和avatar两个字段")
+ public Result> updateMiniProfileOnly(@RequestBody Map body) {
+ final User old = securityUtil.getCurrUser();
+ String nickname = body == null ? "" : StringUtils.trimToEmpty(body.get("nickname"));
+ String avatar = body == null ? "" : StringUtils.trimToEmpty(body.get("avatar"));
+ if (StringUtils.isBlank(nickname)) {
+ return ResultUtil.error("昵称不能为空");
+ }
+ if (nickname.length() > 20) {
+ return ResultUtil.error("昵称长度不能超过20");
+ }
+ if (StringUtils.isBlank(avatar)) {
+ return ResultUtil.error("头像不能为空");
+ }
+
+ userService.updateMiniProfile(old.getId(), nickname, avatar);
+ Map result = new HashMap<>();
+ result.put("id", old.getId());
+ result.put("nickname", nickname);
+ result.put("avatar", avatar);
+ return new ResultUtil>().setData(result);
+ }
+
/**
* 线上demo不允许测试账号改密码
*
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/campus/controller/CampusAdminController.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/campus/controller/CampusAdminController.java
new file mode 100644
index 00000000..facf6096
--- /dev/null
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/campus/controller/CampusAdminController.java
@@ -0,0 +1,164 @@
+package cc.hiver.mall.campus.controller;
+
+import cc.hiver.core.common.utils.ResultUtil;
+import cc.hiver.core.common.utils.SecurityUtil;
+import cc.hiver.core.common.vo.Result;
+import cc.hiver.core.entity.User;
+import cc.hiver.mall.campus.dto.CampusAdminActionDTO;
+import cc.hiver.mall.campus.dto.CampusPageQuery;
+import cc.hiver.mall.campus.entity.*;
+import cc.hiver.mall.campus.service.CampusService;
+import cc.hiver.mall.ie.entity.IeContentAuditLog;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@Api(tags = "校园圈后台管理接口")
+@RequestMapping("/hiver/app/campus/admin")
+public class CampusAdminController {
+ @Autowired
+ private CampusService campusService;
+ @Autowired
+ private SecurityUtil securityUtil;
+
+ @RequestMapping(value = "/categories", method = RequestMethod.GET)
+ @ApiOperation("后台查询分类与热门标签")
+ public Result> categories(@RequestParam(required = false) String regionId,
+ @RequestParam(required = false) String parentCode,
+ @RequestParam(required = false) String categoryType,
+ @RequestParam(required = false) String keyword,
+ @RequestParam(required = false, defaultValue = "1") Integer pageNum,
+ @RequestParam(required = false, defaultValue = "10") Integer pageSize) {
+ User admin = currentUser();
+ String currentRegionId = regionId == null || regionId.trim().isEmpty() ? admin.getDepartmentId() : regionId;
+ CampusPageQuery query = new CampusPageQuery();
+ query.setRegionId(currentRegionId);
+ query.setParentCode(parentCode);
+ query.setCategoryType(categoryType);
+ query.setKeyword(keyword);
+ query.setPageNum(pageNum);
+ query.setPageSize(pageSize);
+ return new ResultUtil>().setData(campusService.adminPageCategories(query));
+ }
+
+ @RequestMapping(value = "/categories", method = RequestMethod.POST)
+ @ApiOperation("新增/编辑分类与热门标签")
+ public Result saveCategory(@RequestBody CampusCategory category) {
+ return new ResultUtil().setData(campusService.saveCategory(category, currentUser()));
+ }
+
+ @RequestMapping(value = "/categories/status", method = RequestMethod.POST)
+ @ApiOperation("上下架分类与热门标签")
+ public Result