sczx_group/sczx_web
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化调整

Browse Source
This commit is contained in:
19173159168
2025-08-08 00:06:50 +08:00
parent 2b4806efb8
commit 0677ca3ede
13 changed files with 205 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ruoyi-admin/src/main/java/com/ruoyi/operation/domain/CompanyStore.java
View File

@ -57,7 +57,7 @@ public class CompanyStore extends BaseEntity
private String cityName;
/** 区县 */
private Long areaId;
private String areaId;
/** 城市 */
@Excel(name = "城市")
@ -127,7 +127,7 @@ public class CompanyStore extends BaseEntity
private Long operatingCompanyId;
/** 运营性质 1.直营 0.合作 */
@Excel(name = "运营性质 1.直营 0.合作")
@Excel(name = "运营性质")
private Integer operatingNature;
/** 简介 */
@ -143,36 +143,28 @@ public class CompanyStore extends BaseEntity
private String storeNumber;
/** 营业执照 */
@Excel(name = "营业执照")
private String businessLicenseImg;
/** 审核状态 0.未审核 1.审核通过 2.审核未通过 */
@Excel(name = "审核状态 0.未审核 1.审核通过 2.审核未通过")
private Integer auditStatus;
/** 审核时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date auditTime;
/** 审核人id */
@Excel(name = "审核人id")
private Long auditorId;
/** 所属用户id */
@Excel(name = "所属用户id")
private Long userId;
/** 是否允许回收退租天数 0.不允许 1.允许 */
@Excel(name = "是否允许回收退租天数 0.不允许 1.允许")
private Integer isReturnAllowed;
/** 企业套餐保证金 */
@Excel(name = "企业套餐保证金")
private BigDecimal mealDepositPrice;
/** 企业充值订单数限制 */
@Excel(name = "企业充值订单数限制")
private Long orderNumLimit;
/** */
@ -285,11 +277,11 @@ public class CompanyStore extends BaseEntity
this.cityName = cityName;
}
public Long getAreaId() {
public String getAreaId() {
return areaId;
}
public void setAreaId(Long areaId) {
public void setAreaId(String areaId) {
this.areaId = areaId;
}

32
ruoyi-admin/src/main/java/com/ruoyi/operation/service/impl/CompanyStoreServiceImpl.java
View File

@ -2,6 +2,9 @@ package com.ruoyi.operation.service.impl;
import java.util.List;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.domain.SysAreaHn;
import com.ruoyi.system.service.ISysAreaHnService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.operation.mapper.CompanyStoreMapper;
@ -20,7 +23,8 @@ public class CompanyStoreServiceImpl implements ICompanyStoreService
{
@Autowired
private CompanyStoreMapper companyStoreMapper;
@Autowired
private ISysAreaHnService sysAreaHnService;
/**
* 查询门店
*
@ -56,14 +60,22 @@ public class CompanyStoreServiceImpl implements ICompanyStoreService
{
companyStore.setCreateTime(DateUtils.getNowDate());
companyStore.setUpdateTime(DateUtils.getNowDate());
if(companyStore.getAuditStatus().equals("1")){
companyStore.setStatus("0");
}else{
companyStore.setStatus("0");
}
companyStore.setStatus("0");
setAreaInfo(companyStore);
return companyStoreMapper.insertCompanyStore(companyStore);
}
private void setAreaInfo(CompanyStore companyStore){
//获取当前区划
String areaCode = companyStore.getAreaId();
SysAreaHn areaHn = sysAreaHnService.selectSysAreaHnByCode(areaCode.substring(0,4)+"00000000");
companyStore.setCityId(areaHn.getAreaCode());
companyStore.setCityName(areaHn.getName());
companyStore.setProvinceId(areaHn.getParentCode());
companyStore.setProvinceName(areaHn.getParentName());
}
/**
* 修改门店
*
@ -74,11 +86,9 @@ public class CompanyStoreServiceImpl implements ICompanyStoreService
public int updateCompanyStore(CompanyStore companyStore)
{
companyStore.setUpdateTime(DateUtils.getNowDate());
if(companyStore.getAuditStatus().equals("1")){
companyStore.setStatus("0");
}else{
companyStore.setStatus("0");
}
companyStore.setStatus("0");
setAreaInfo(companyStore);
return companyStoreMapper.updateCompanyStore(companyStore);
}

8
ruoyi-admin/src/main/java/com/ruoyi/orders/domain/ZcOrderMain.java
View File

@ -93,13 +93,13 @@ public class ZcOrderMain extends BaseEntity
private Integer isAutoDeduct;
/** 首次下单时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "首次下单时间", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "首次下单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date firstOrderTime;
/** 开始计费时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "开始计费时间", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "开始计费时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date startRentTime;
/** 逾期天数 */