diff --git a/ruoyi-admin/src/main/java/com/ruoyi/operation/controller/CompanyController.java b/ruoyi-admin/src/main/java/com/ruoyi/operation/controller/CompanyController.java index 9009df4..cca02ec 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/operation/controller/CompanyController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/operation/controller/CompanyController.java @@ -202,15 +202,6 @@ public class CompanyController extends BaseController @ResponseBody public AjaxResult changeStatus(Company company) { - int flag = companyService.changeStatus(company); - if(flag >0) { - // 运营商启用停用，同时启用停用用户信息 - SysUser user = userService.selectUserByPhoneNumber(company.getPhone()); - if(user != null) { - user.setStatus(company.getStatus()); - userService.changeStatus(user); - } - } - return toAjax(flag); + return toAjax(companyService.changeStatus(company)); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/operation/mapper/CompanyStoreMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/operation/mapper/CompanyStoreMapper.java index fce8202..83ee6f9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/operation/mapper/CompanyStoreMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/operation/mapper/CompanyStoreMapper.java @@ -58,4 +58,6 @@ public interface CompanyStoreMapper * @return 结果 */ public int deleteCompanyStoreByIds(String[] ids); + + public int updateStatusByCompany(CompanyStore companyStore); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/operation/service/ICompanyStoreService.java b/ruoyi-admin/src/main/java/com/ruoyi/operation/service/ICompanyStoreService.java index 20a16da..9733e8d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/operation/service/ICompanyStoreService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/operation/service/ICompanyStoreService.java @@ -61,4 +61,6 @@ public interface ICompanyStoreService public int changeStatus(CompanyStore companyStore); + public int changeStatusByCompany(CompanyStore companyStore); + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/CompanyServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/CompanyServiceImpl.java index 1e2eb19..f1e307e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/CompanyServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/CompanyServiceImpl.java @@ -7,6 +7,8 @@ import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.operation.domain.CompanyStore; +import com.ruoyi.operation.service.ICompanyStoreService; import com.ruoyi.system.service.ISysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -26,7 +28,10 @@ public class CompanyServiceImpl implements ICompanyService { @Autowired private CompanyMapper companyMapper; - + @Autowired + private ISysUserService userService; + @Autowired + private ICompanyStoreService companyStoreService; /** * 查询运营商 * @@ -127,6 +132,21 @@ public class CompanyServiceImpl implements ICompanyService public int changeStatus(Company company) { company.setUpdateTime(DateUtils.getNowDate()); - return companyMapper.updateCompany(company); + int flag = companyMapper.updateCompany(company); + if(flag >0) { + // 运营商启用停用，同时启用停用用户信息 + SysUser user = userService.selectUserByPhoneNumber(company.getPhone()); + if(user != null) { + user.setStatus(company.getStatus()); + userService.changeStatus(user); + } + // 运营商启用停用，同时启用停用旗下门店 + CompanyStore companyStore = new CompanyStore(); + companyStore.setStatus(company.getStatus()); + companyStore.setOperatingCompanyId(company.getId()); + companyStoreService.changeStatusByCompany(companyStore); + } + return flag; + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/CompanyStoreServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/CompanyStoreServiceImpl.java index bc46374..cf9e3c8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/CompanyStoreServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/CompanyStoreServiceImpl.java @@ -111,4 +111,8 @@ public class CompanyStoreServiceImpl implements ICompanyStoreService companyStore.setUpdateTime(DateUtils.getNowDate()); return companyStoreMapper.updateCompanyStore(companyStore); } + @Override + public int changeStatusByCompany(CompanyStore companyStore){ + return companyStoreMapper.updateStatusByCompany(companyStore); + } } diff --git a/ruoyi-admin/src/main/resources/mapper/operation/CompanyStoreMapper.xml b/ruoyi-admin/src/main/resources/mapper/operation/CompanyStoreMapper.xml index 079e5c7..3d5ba3e 100644 --- a/ruoyi-admin/src/main/resources/mapper/operation/CompanyStoreMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/operation/CompanyStoreMapper.xml @@ -284,7 +284,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - + + update zc_company_store SET status = #{status} + where operating_company_id = #{operatingCompanyId} + delete from zc_company_store where id = #{id} diff --git a/ruoyi-admin/src/main/resources/static/img/profile.jpg b/ruoyi-admin/src/main/resources/static/img/profile.jpg index b3a940b..e15b94c 100644 Binary files a/ruoyi-admin/src/main/resources/static/img/profile.jpg and b/ruoyi-admin/src/main/resources/static/img/profile.jpg differ diff --git a/ruoyi-admin/src/main/resources/static/img/qr_code.png b/ruoyi-admin/src/main/resources/static/img/qr_code.png deleted file mode 100644 index ecba6d6..0000000 Binary files a/ruoyi-admin/src/main/resources/static/img/qr_code.png and /dev/null differ diff --git a/ruoyi-admin/src/main/resources/templates/lock.html b/ruoyi-admin/src/main/resources/templates/lock.html index cd8223c..49b89f4 100644 --- a/ruoyi-admin/src/main/resources/templates/lock.html +++ b/ruoyi-admin/src/main/resources/templates/lock.html @@ -10,7 +10,7 @@ - +
闪充智行
@@ -71,8 +71,8 @@ setInterval(function() { $('.lockscreen-time').text((new Date()).format('hh:mm:ss')); }, 500); - init(); - animate(); + //init(); + //animate(); }); $(document).keydown(function(event) { diff --git a/ruoyi-admin/src/main/resources/templates/orders/order/order.html b/ruoyi-admin/src/main/resources/templates/orders/order/order.html index bf5f13d..c0dad3b 100644 --- a/ruoyi-admin/src/main/resources/templates/orders/order/order.html +++ b/ruoyi-admin/src/main/resources/templates/orders/order/order.html @@ -142,10 +142,7 @@ return $.table.selectDictLabel(rentalTypeDatas, value); } }, - { - field: 'rentalDays', - title: '租赁天数' - }, + { field: 'rentalPrice', title: '租车价格(元)'