diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/UserAddressController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/UserAddressController.java index 304d224..363f64b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/UserAddressController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/UserAddressController.java @@ -99,6 +99,20 @@ public class UserAddressController extends BaseController @PutMapping public AjaxResult edit(@RequestBody UserAddress userAddress) { + if(userAddress.getIsDefault()==1){ + //如果设为默认就将这个用户下所有数据设置为不默认,然后添加这条默认 + userAddressService.updateUserAddressDefault(userAddress.getUid()); + }else{ + //如果用户没有默认地址,而且只添加了一条地址,那么就强制默认这个地址是默认地址 + UserAddress userAddressData=new UserAddress(); + userAddressData.setUid(userAddress.getUid()); + userAddressData.setIsDefault(Long.valueOf(1)); + List list = userAddressService.selectUserAddressList(userAddressData); + //判断用户当前是否有默认地址 + if(list.size()<1){ + userAddress.setIsDefault(Long.valueOf(1)); + } + } return toAjax(userAddressService.updateUserAddress(userAddress)); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/UsersController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/UsersController.java index fbe7523..c19236d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/UsersController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/UsersController.java @@ -2,6 +2,8 @@ package com.ruoyi.system.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.ruoyi.system.domain.QuoteType; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -90,7 +92,27 @@ public class UsersController extends BaseController { return toAjax(usersService.updateUsers(users)); } + /** + * 定时任务状态修改 + */ + @PreAuthorize("@ss.hasPermi('system:users:changeStatus')") + @Log(title = "定时任务", businessType = BusinessType.UPDATE) + @PutMapping("/changeStatus") + public AjaxResult changeStatus(@RequestBody Users users) + { + // 修改或新增时:状态为关闭时,修改用户的type为1和is_work为0 + //Type:1:普通用户 2:师傅。 + // is_work:1:师傅。 0普通用户 + Users newUsers = usersService.selectUsersById(users.getId()); + System.out.println("###############"+newUsers.getType()); + if (newUsers.getType().equals("2")&&users.getStatus()==0){ + newUsers.setType("1"); + newUsers.setIsWork(0); + } + newUsers.setStatus(users.getStatus()); + return toAjax(usersService.updateUsers(newUsers)); + } /** * 删除【请填写功能名称】 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/Users.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/Users.java index eb2de38..17822d5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/Users.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/Users.java @@ -70,6 +70,10 @@ public class Users extends BaseEntity @Excel(name = "1:启用 0:关闭") private Integer status; + /**是否为师傅 是否为师傅1是,0否 */ + @Excel(name = "1:是 ,0:否") + private Integer isWork; + /** 师傅等级 */ @Excel(name = "师傅等级") private Integer level; @@ -495,6 +499,14 @@ public class Users extends BaseEntity this.totalCommMin = totalCommMin; } + public Integer getIsWork() { + return isWork; + } + + public void setIsWork(Integer isWork) { + this.isWork = isWork; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserAddressMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserAddressMapper.java index a6f21f7..acdeac3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserAddressMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserAddressMapper.java @@ -35,6 +35,16 @@ public interface UserAddressMapper */ public int insertUserAddress(UserAddress userAddress); + + /** + * 修改用户默认地址 + * + * @param uid 用户收货地址 + * @return 结果 + */ + public int updateUserAddressDefault(Long uid); + + /** * 修改用户收货地址 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserAddressService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserAddressService.java index 15dd3cf..d364025 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserAddressService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IUserAddressService.java @@ -26,7 +26,13 @@ public interface IUserAddressService * @return 用户收货地址集合 */ public List selectUserAddressList(UserAddress userAddress); - + /** + * 修改用户默认地址 + * + * @param uid 用户id + * @return 结果 + */ + public int updateUserAddressDefault(Long uid); /** * 新增用户收货地址 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserAddressServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserAddressServiceImpl.java index f585efe..f4e37df 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserAddressServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserAddressServiceImpl.java @@ -30,7 +30,16 @@ public class UserAddressServiceImpl implements IUserAddressService { return userAddressMapper.selectUserAddressById(id); } + /** + * 修改用户默认地址 + * + * @param uid 用户id + * @return 结果 + */ + public int updateUserAddressDefault(Long uid) { + return userAddressMapper.updateUserAddressDefault(uid); + } /** * 查询用户收货地址列表 * diff --git a/ruoyi-system/src/main/resources/mapper/system/UserAddressMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UserAddressMapper.xml index 6c2f4cb..61c81eb 100644 --- a/ruoyi-system/src/main/resources/mapper/system/UserAddressMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/UserAddressMapper.xml @@ -92,6 +92,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} + + + + update user_address + + is_default =0 + updated_at=NOW() + + where uid = #{uid} + + + + delete from user_address where id = #{id} diff --git a/ruoyi-system/src/main/resources/mapper/system/UsersMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UsersMapper.xml index bd9ded2..9dc9c05 100644 --- a/ruoyi-system/src/main/resources/mapper/system/UsersMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/UsersMapper.xml @@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -115,6 +116,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" total_integral, status, level, + is_work, + commission, total_comm, margin, @@ -146,6 +149,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{totalIntegral}, #{status}, #{level}, + #{isWork}, #{commission}, #{totalComm}, #{margin}, @@ -181,6 +185,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" total_integral = #{totalIntegral}, status = #{status}, level = #{level}, + is_work = #{isWork}, commission = #{commission}, total_comm = #{totalComm}, margin = #{margin}, diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index a809d6e..638b6e3 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -58,6 +58,7 @@ "vue-cropper": "0.5.5", "vue-meta": "2.4.0", "vue-router": "3.4.9", + "vue-sku-form": "^0.4.1", "vuedraggable": "2.24.3", "vuex": "3.6.0" }, diff --git a/ruoyi-ui/src/api/system/users.js b/ruoyi-ui/src/api/system/users.js index 4c1b29e..b0a11c0 100644 --- a/ruoyi-ui/src/api/system/users.js +++ b/ruoyi-ui/src/api/system/users.js @@ -16,7 +16,18 @@ export function getUsers(id) { method: 'get' }) } - +// 任务状态修改 +export function changetypeStatus(id, status) { + const data = { + id, + status + } + return request({ + url: '/system/users/changeStatus', + method: 'put', + data: data + }) +} // 新增用户列表 export function addUsers(data) { return request({ diff --git a/ruoyi-ui/src/main.js b/ruoyi-ui/src/main.js index c0fd781..a264800 100644 --- a/ruoyi-ui/src/main.js +++ b/ruoyi-ui/src/main.js @@ -1,5 +1,5 @@ import Vue from 'vue' - +import SkuForm from 'vue-sku-form' import Cookies from 'js-cookie' import Element from 'element-ui' @@ -40,6 +40,8 @@ import DictData from '@/components/DictData' // 美化包装组件 import BeautyWrapper from '@/components/BeautyWrapper' +import sku from '@/components/Sku/sku' + // 全局方法挂载 Vue.prototype.getDicts = getDicts Vue.prototype.getConfigKey = getConfigKey @@ -60,10 +62,12 @@ Vue.component('FileUpload', FileUpload) Vue.component('ImageUpload', ImageUpload) Vue.component('ImagePreview', ImagePreview) Vue.component('BeautyWrapper', BeautyWrapper) +Vue.component('Sku', sku) Vue.use(directive) Vue.use(plugins) Vue.use(VueMeta) +Vue.use(SkuForm) DictData.install() /** diff --git a/ruoyi-ui/src/views/system/ServiceGoods/index.vue b/ruoyi-ui/src/views/system/ServiceGoods/index.vue index b2767f2..57b3316 100644 --- a/ruoyi-ui/src/views/system/ServiceGoods/index.vue +++ b/ruoyi-ui/src/views/system/ServiceGoods/index.vue @@ -203,110 +203,119 @@ /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{dict.label}} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 单规格 + 多规格 + + +
+ + + + + + +
+
+ +
+
+ + + + + + + + + + + + +
- +
+
@@ -330,10 +339,12 @@ diff --git a/ruoyi-ui/src/views/system/UserAddress/index.vue b/ruoyi-ui/src/views/system/UserAddress/index.vue index 743cbfd..dd3c69b 100644 --- a/ruoyi-ui/src/views/system/UserAddress/index.vue +++ b/ruoyi-ui/src/views/system/UserAddress/index.vue @@ -185,10 +185,10 @@ - + - +