| @@ -14,7 +14,6 @@ import com.iformall.enums.EnumInvestUserType; | |||||
| import com.iformall.enums.EnumUserAdmin; | import com.iformall.enums.EnumUserAdmin; | ||||
| import com.iformall.service.*; | import com.iformall.service.*; | ||||
| import com.iformall.shiro.PasswordHelper; | import com.iformall.shiro.PasswordHelper; | ||||
| import com.iformall.sms.EnumSMSChannel; | |||||
| import com.iformall.utils.Constant; | import com.iformall.utils.Constant; | ||||
| import io.swagger.annotations.Api; | import io.swagger.annotations.Api; | ||||
| import io.swagger.annotations.ApiOperation; | import io.swagger.annotations.ApiOperation; | ||||
| @@ -25,7 +24,6 @@ import org.springframework.beans.factory.annotation.Autowired; | |||||
| import org.springframework.beans.factory.annotation.Qualifier; | import org.springframework.beans.factory.annotation.Qualifier; | ||||
| import org.springframework.data.redis.core.RedisTemplate; | import org.springframework.data.redis.core.RedisTemplate; | ||||
| import org.springframework.util.Assert; | import org.springframework.util.Assert; | ||||
| import org.springframework.web.bind.WebDataBinder; | |||||
| import org.springframework.web.bind.annotation.*; | import org.springframework.web.bind.annotation.*; | ||||
| import java.util.*; | import java.util.*; | ||||
| @@ -179,15 +177,18 @@ public class WxProjectConfigController extends BaseController { | |||||
| }else{ | }else{ | ||||
| wxMall.setGroupSupport(EnumGroupSupport.NOT_SUPPORT.getCode()); | wxMall.setGroupSupport(EnumGroupSupport.NOT_SUPPORT.getCode()); | ||||
| } | } | ||||
| if(StringUtils.isBlank(wxMall.getBusinessHours())){ | |||||
| if(wxMall.getId() == null && StringUtils.isBlank(wxMall.getBusinessHours())){ | |||||
| wxMall.setBusinessHours("[]"); | wxMall.setBusinessHours("[]"); | ||||
| } | } | ||||
| if(StringUtils.isBlank(wxMall.getIntroduction())){ | |||||
| if(wxMall.getId() == null && StringUtils.isBlank(wxMall.getIntroduction())){ | |||||
| wxMall.setIntroduction(""); | wxMall.setIntroduction(""); | ||||
| } | } | ||||
| if(StringUtils.isBlank(wxMall.getImg())){ | |||||
| if(wxMall.getId() == null && StringUtils.isBlank(wxMall.getImg())){ | |||||
| wxMall.setImg(""); | wxMall.setImg(""); | ||||
| } | } | ||||
| if(wxMall.getId() == null && StringUtils.isBlank(wxMall.getWeapNote())){ | |||||
| wxMall.setWeapNote("{}"); | |||||
| } | |||||
| wxProjectConfigService.initMall(wxMall); | wxProjectConfigService.initMall(wxMall); | ||||
| return new ResultData(); | return new ResultData(); | ||||
| @@ -288,26 +289,26 @@ public class WxProjectConfigController extends BaseController { | |||||
| wxAuthorizerInfo.updateTenantInfo(wxAppinfo); | wxAuthorizerInfo.updateTenantInfo(wxAppinfo); | ||||
| wxAuthorizerInfo.setType(wxAppinfo.getType()); | wxAuthorizerInfo.setType(wxAppinfo.getType()); | ||||
| wxAuthorizerInfo.setAuthorizerAppid(wxAppinfo.getAppId()); | wxAuthorizerInfo.setAuthorizerAppid(wxAppinfo.getAppId()); | ||||
| if(wxAuthorizerInfo.getAuthorizationStatus() == null){ | |||||
| if(wxAppinfo.getId() == null && wxAuthorizerInfo.getAuthorizationStatus() == null){ | |||||
| wxAuthorizerInfo.setAuthorizationStatus(0);//授权状态,0为已授权,1为已取消授权 | wxAuthorizerInfo.setAuthorizationStatus(0);//授权状态,0为已授权,1为已取消授权 | ||||
| wxAuthorizerInfo.setAuthTime(new Date()); | wxAuthorizerInfo.setAuthTime(new Date()); | ||||
| } | } | ||||
| if(wxAuthorizerInfo.getBaseStatus() == null){ | |||||
| if(wxAppinfo.getId() == null && wxAuthorizerInfo.getBaseStatus() == null){ | |||||
| wxAuthorizerInfo.setBaseStatus(0);//微信基础版本设置状态,0为已设置,1为设置失败 | wxAuthorizerInfo.setBaseStatus(0);//微信基础版本设置状态,0为已设置,1为设置失败 | ||||
| wxAuthorizerInfo.setBaseTime(new Date()); | wxAuthorizerInfo.setBaseTime(new Date()); | ||||
| } | } | ||||
| if(wxAuthorizerInfo.getDomainStatus() == null){ | |||||
| if(wxAppinfo.getId() == null && wxAuthorizerInfo.getDomainStatus() == null){ | |||||
| wxAuthorizerInfo.setDomainStatus(0);//服务器域名设置状态,0为已设置,1为设置失败 | wxAuthorizerInfo.setDomainStatus(0);//服务器域名设置状态,0为已设置,1为设置失败 | ||||
| wxAuthorizerInfo.setDomainTime(new Date()); | wxAuthorizerInfo.setDomainTime(new Date()); | ||||
| } | } | ||||
| if(wxAuthorizerInfo.getWebdomainStatus() == null){ | |||||
| if(wxAppinfo.getId() == null && wxAuthorizerInfo.getWebdomainStatus() == null){ | |||||
| wxAuthorizerInfo.setWebdomainStatus(0);//服务器业务域名设置状态,0为已设置,1为设置失败 | wxAuthorizerInfo.setWebdomainStatus(0);//服务器业务域名设置状态,0为已设置,1为设置失败 | ||||
| wxAuthorizerInfo.setWebdomainTime(new Date()); | wxAuthorizerInfo.setWebdomainTime(new Date()); | ||||
| } | } | ||||
| if(StringUtils.isBlank(wxAuthorizerInfo.getRefreshToken())){ | |||||
| if(wxAppinfo.getId() == null && StringUtils.isBlank(wxAuthorizerInfo.getRefreshToken())){ | |||||
| wxAuthorizerInfo.setRefreshToken(""); | wxAuthorizerInfo.setRefreshToken(""); | ||||
| } | } | ||||
| if(StringUtils.isBlank(wxAuthorizerInfo.getAccessToken())){ | |||||
| if(wxAppinfo.getId() == null && StringUtils.isBlank(wxAuthorizerInfo.getAccessToken())){ | |||||
| wxAuthorizerInfo.setAccessToken(""); | wxAuthorizerInfo.setAccessToken(""); | ||||
| } | } | ||||
| wxAuthorizerInfoService.saveOrUpdate(wxAuthorizerInfo); | wxAuthorizerInfoService.saveOrUpdate(wxAuthorizerInfo); | ||||
| @@ -447,19 +448,19 @@ public class WxProjectConfigController extends BaseController { | |||||
| if(wxPark.getNumber() == null){ | if(wxPark.getNumber() == null){ | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | ||||
| } | } | ||||
| if(StringUtils.isBlank(wxPark.getVendorParams())){ | |||||
| if(wxPark.getId() == null && StringUtils.isBlank(wxPark.getVendorParams())){ | |||||
| wxPark.setVendorParams("{}"); | wxPark.setVendorParams("{}"); | ||||
| } | } | ||||
| if(wxPark.getVendorType() == null){ | |||||
| if(wxPark.getId() == null && wxPark.getVendorType() == null){ | |||||
| wxPark.setVendorType(0); | wxPark.setVendorType(0); | ||||
| } | } | ||||
| if(StringUtils.isBlank(wxPark.getParkId())){ | |||||
| if(wxPark.getId() == null && StringUtils.isBlank(wxPark.getParkId())){ | |||||
| wxPark.setParkId("0"); | wxPark.setParkId("0"); | ||||
| } | } | ||||
| if(StringUtils.isBlank(wxPark.getStopFee())){ | |||||
| if(wxPark.getId() == null && StringUtils.isBlank(wxPark.getStopFee())){ | |||||
| wxPark.setStopFee(""); | wxPark.setStopFee(""); | ||||
| } | } | ||||
| if(wxPark.getEntryExit() == null){ | |||||
| if(wxPark.getId() == null && wxPark.getEntryExit() == null){ | |||||
| wxPark.setEntryExit(1); | wxPark.setEntryExit(1); | ||||
| } | } | ||||
| wxParkService.saveOrUpdate(wxPark); | wxParkService.saveOrUpdate(wxPark); | ||||