diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java index 602e357d1..251e252c9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java @@ -14,7 +14,6 @@ import com.iformall.enums.EnumInvestUserType; import com.iformall.enums.EnumUserAdmin; import com.iformall.service.*; import com.iformall.shiro.PasswordHelper; -import com.iformall.sms.EnumSMSChannel; import com.iformall.utils.Constant; import io.swagger.annotations.Api; 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.data.redis.core.RedisTemplate; import org.springframework.util.Assert; -import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.*; import java.util.*; @@ -179,15 +177,18 @@ public class WxProjectConfigController extends BaseController { }else{ wxMall.setGroupSupport(EnumGroupSupport.NOT_SUPPORT.getCode()); } - if(StringUtils.isBlank(wxMall.getBusinessHours())){ + if(wxMall.getId() == null && StringUtils.isBlank(wxMall.getBusinessHours())){ wxMall.setBusinessHours("[]"); } - if(StringUtils.isBlank(wxMall.getIntroduction())){ + if(wxMall.getId() == null && StringUtils.isBlank(wxMall.getIntroduction())){ wxMall.setIntroduction(""); } - if(StringUtils.isBlank(wxMall.getImg())){ + if(wxMall.getId() == null && StringUtils.isBlank(wxMall.getImg())){ wxMall.setImg(""); } + if(wxMall.getId() == null && StringUtils.isBlank(wxMall.getWeapNote())){ + wxMall.setWeapNote("{}"); + } wxProjectConfigService.initMall(wxMall); return new ResultData(); @@ -288,26 +289,26 @@ public class WxProjectConfigController extends BaseController { wxAuthorizerInfo.updateTenantInfo(wxAppinfo); wxAuthorizerInfo.setType(wxAppinfo.getType()); wxAuthorizerInfo.setAuthorizerAppid(wxAppinfo.getAppId()); - if(wxAuthorizerInfo.getAuthorizationStatus() == null){ + if(wxAppinfo.getId() == null && wxAuthorizerInfo.getAuthorizationStatus() == null){ wxAuthorizerInfo.setAuthorizationStatus(0);//授权状态,0为已授权,1为已取消授权 wxAuthorizerInfo.setAuthTime(new Date()); } - if(wxAuthorizerInfo.getBaseStatus() == null){ + if(wxAppinfo.getId() == null && wxAuthorizerInfo.getBaseStatus() == null){ wxAuthorizerInfo.setBaseStatus(0);//微信基础版本设置状态,0为已设置,1为设置失败 wxAuthorizerInfo.setBaseTime(new Date()); } - if(wxAuthorizerInfo.getDomainStatus() == null){ + if(wxAppinfo.getId() == null && wxAuthorizerInfo.getDomainStatus() == null){ wxAuthorizerInfo.setDomainStatus(0);//服务器域名设置状态,0为已设置,1为设置失败 wxAuthorizerInfo.setDomainTime(new Date()); } - if(wxAuthorizerInfo.getWebdomainStatus() == null){ + if(wxAppinfo.getId() == null && wxAuthorizerInfo.getWebdomainStatus() == null){ wxAuthorizerInfo.setWebdomainStatus(0);//服务器业务域名设置状态,0为已设置,1为设置失败 wxAuthorizerInfo.setWebdomainTime(new Date()); } - if(StringUtils.isBlank(wxAuthorizerInfo.getRefreshToken())){ + if(wxAppinfo.getId() == null && StringUtils.isBlank(wxAuthorizerInfo.getRefreshToken())){ wxAuthorizerInfo.setRefreshToken(""); } - if(StringUtils.isBlank(wxAuthorizerInfo.getAccessToken())){ + if(wxAppinfo.getId() == null && StringUtils.isBlank(wxAuthorizerInfo.getAccessToken())){ wxAuthorizerInfo.setAccessToken(""); } wxAuthorizerInfoService.saveOrUpdate(wxAuthorizerInfo); @@ -447,19 +448,19 @@ public class WxProjectConfigController extends BaseController { if(wxPark.getNumber() == null){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } - if(StringUtils.isBlank(wxPark.getVendorParams())){ + if(wxPark.getId() == null && StringUtils.isBlank(wxPark.getVendorParams())){ wxPark.setVendorParams("{}"); } - if(wxPark.getVendorType() == null){ + if(wxPark.getId() == null && wxPark.getVendorType() == null){ wxPark.setVendorType(0); } - if(StringUtils.isBlank(wxPark.getParkId())){ + if(wxPark.getId() == null && StringUtils.isBlank(wxPark.getParkId())){ wxPark.setParkId("0"); } - if(StringUtils.isBlank(wxPark.getStopFee())){ + if(wxPark.getId() == null && StringUtils.isBlank(wxPark.getStopFee())){ wxPark.setStopFee(""); } - if(wxPark.getEntryExit() == null){ + if(wxPark.getId() == null && wxPark.getEntryExit() == null){ wxPark.setEntryExit(1); } wxParkService.saveOrUpdate(wxPark); @@ -628,17 +629,20 @@ public class WxProjectConfigController extends BaseController { @PostMapping("/init/submall") @SystemControllerLog(description = "子广场-更新") @TenantIgnore - public ResultData initSubmall(@RequestBody WxMall wxMall) { + public ResultData initSubmall(@RequestBody Map map) { logger.debug("[" + getIpAddr() + "] WxProjectConfigController::initSubmall"); try { - if(StringUtils.isBlank(wxMall.getTenantId())){ - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); - } - if(StringUtils.isBlank(wxMall.getParentTenantId())){ + String tenantId = (String) map.get("tenantId"); + List subTenantIds = (List) map.get("subTenantIds"); + + if(StringUtils.isBlank(tenantId)){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } +// if(subTenantIds == null || subTenantIds.length == 0){ +// return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); +// } TenantEntity TenantEntity = new TenantEntity(){{ - setTenantId(wxMall.getParentTenantId()); + setTenantId(tenantId); }}; WxMall parentWxMall = wxMallService.getByTenantInfo(TenantEntity); if(parentWxMall == null || parentWxMall.getSaleType() != 100 @@ -646,8 +650,7 @@ public class WxProjectConfigController extends BaseController { || StringUtils.isNotBlank(parentWxMall.getParentTenantId())){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); } - String[] tenantIds = wxMall.getTenantId().split(","); - wxProjectConfigService.initSubmall(wxMall.getParentTenantId(),tenantIds); + wxProjectConfigService.initSubmall(tenantId,subTenantIds); return new ResultData(); }catch (Exception e){ @@ -660,17 +663,23 @@ public class WxProjectConfigController extends BaseController { @PostMapping("/init/after/group") @SystemControllerLog(description = "商场-数据更新") @TenantIgnore - public ResultData initAfterGroup(@RequestBody WxMall wxMall) { + public ResultData initAfterGroup(@RequestBody Map map) { logger.debug("[" + getIpAddr() + "] WxProjectConfigController::initAfterGroup"); try { - if(StringUtils.isBlank(wxMall.getTenantId())){ + String tenantId = (String) map.get("tenantId"); + List subTenantIds = (List) map.get("subTenantIds"); + String subTenantIdStrs = null; + + if(StringUtils.isBlank(tenantId)){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } - if(StringUtils.isBlank(wxMall.getParentTenantId())){ - return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + if(subTenantIds == null || subTenantIds.size() == 0){ + //return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + }else{ + subTenantIdStrs = StringUtils.join(subTenantIds, ','); } TenantEntity TenantEntity = new TenantEntity(){{ - setTenantId(wxMall.getParentTenantId()); + setTenantId(tenantId); }}; WxMall parentWxMall = wxMallService.getByTenantInfo(TenantEntity); if(parentWxMall == null || parentWxMall.getSaleType() != 100 @@ -687,7 +696,9 @@ public class WxProjectConfigController extends BaseController { }else{ openRedisTemplate.opsForValue().set(key,"1",3000, TimeUnit.SECONDS); } - wxProjectConfigService.initAfterGroup(wxMall.getParentTenantId(),wxMall.getTenantId()); + +// String join = StringUtils.join(subTenantIds, ','); + wxProjectConfigService.initAfterGroup(tenantId,subTenantIdStrs); return new ResultData(); }catch (Exception e){ diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index 98f71f117..7bab67d11 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -57,10 +57,10 @@ public class WxCouponController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) @SystemControllerLog(description = "券投放-列表") - public ResultData list(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize,Integer type) { + public ResultData list(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize,Integer dataType) { logger.debug("[" + getIpAddr() + "] WxCouponController::list"); if (wxCoupon == null) wxCoupon = new WxCoupon(); - if(null != null && type == 1){ + if(null != dataType && dataType == 1){ wxCoupon.updateTenantInfo(ifParentUpdateTenantInfo()); }else{ wxCoupon.updateTenantInfo(getTenantInfo()); diff --git a/mallinkAdmin/src/main/resources/db/migration/V202007311142__GROUP__ADD_002.sql b/mallinkAdmin/src/main/resources/db/migration/V202007311142__GROUP__ADD_002.sql index 4d1698fef..eb5e37d91 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202007311142__GROUP__ADD_002.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202007311142__GROUP__ADD_002.sql @@ -20,10 +20,12 @@ BEGIN PREPARE stmt_old FROM @old_data_sql; EXECUTE stmt_old; DEALLOCATE PREPARE stmt_old; - SET @new_data_sql = CONCAT("UPDATE ",tableName," SET parent_tenant_id = '",tenantId,"' WHERE FIND_IN_SET(tenant_id ,'",subTenantIds,"');"); - PREPARE stmt_new FROM @new_data_sql; - EXECUTE stmt_new; - DEALLOCATE PREPARE stmt_new; + IF ISNULL(subTenantIds)=0 and LENGTH(trim(subTenantIds))>0 THEN + SET @new_data_sql = CONCAT("UPDATE ",tableName," SET parent_tenant_id = '",tenantId,"' WHERE FIND_IN_SET(tenant_id ,'",subTenantIds,"');"); + PREPARE stmt_new FROM @new_data_sql; + EXECUTE stmt_new; + DEALLOCATE PREPARE stmt_new; + END IF; END LOOP; CLOSE table_cursor; IF err_flag THEN diff --git a/mallinkAdmin/src/main/resources/db/migration/V202007311200__FOR_MEMBER_ONLY_001.sql b/mallinkAdmin/src/main/resources/db/migration/V202007311200__FOR_MEMBER_ONLY_001.sql index 9fe7e95a9..08d62ce89 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202007311200__FOR_MEMBER_ONLY_001.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202007311200__FOR_MEMBER_ONLY_001.sql @@ -86,6 +86,9 @@ ADD COLUMN `from_id` BIGINT(20) DEFAULT NULL COMMENT '来源ID,针对续签, ALTER TABLE `wx_c_user_car` ADD COLUMN `vendor_person_id` VARCHAR(100) DEFAULT NULL COMMENT '停车场的会员ID'; +INSERT INTO `mall_permission`(`id`, `name`, `parent_id`, `available`, `permission`, `resource_type`, `module_color`, `module_color_num`, `url`, `icon`, `version_type`, `sort`) VALUES (593, '开发人员专用', 50, 'Y', NULL, 1, NULL, NULL, 'developer', 'icon-shenpiguanli', 0, 593); + + ALTER TABLE `wx_mall` MODIFY COLUMN `img_url` varchar(250) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商场图标' AFTER `service_phone`, MODIFY COLUMN `img_url_h` varchar(250) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商场图标_横' AFTER `img_url`; diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index 6ff1a1e51..bfd94220a 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -565,6 +565,14 @@ public class WxUserGrantController extends BaseController { user.setLanguage(userInfo.getLanguage()); wxCUserService.saveOrUpdate(updateUser); + if(user.getUserId() != null){ + WxCUserBasicInfo wxCUserBasicInfo = new WxCUserBasicInfo(); + wxCUserBasicInfo.setId(user.getUserId()); + wxCUserBasicInfo.setSex(user.getGender()); + wxCUserBasicInfo.setAvatarUrl(user.getAvatarUrl()); + wxCUserBasicInfoService.update(wxCUserBasicInfo); + } + String key = Constant.tokenPrev + user.getToken(); if(baseCUserTokenRedisTemplate.hasKey(key)){ baseCUserTokenRedisTemplate.delete(key); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMallMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMallMapper.java index adbd3a92a..3fb5a70ef 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMallMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMallMapper.java @@ -18,7 +18,7 @@ public interface WxMallMapper extends CommonMapper { String queryMenusByTenantInfo(WxMall wxMall); - void undateSubmall(@Param(value = "parentTenantId")String parentTenantId, @Param(value = "tenantIds")String[] tenantIds); + void undateSubmall(@Param(value = "parentTenantId")String parentTenantId, @Param(value = "tenantIds")List tenantIds); List listAsSelectMall(@Param(value = "id")Long id); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMallService.java b/mallinkService/src/main/java/com/iformall/service/WxMallService.java index 754ef87b0..930d89e9d 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMallService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMallService.java @@ -80,7 +80,7 @@ public interface WxMallService { */ List getSubByParentTenantId(String parentTenantId); - void undateSubmall(String parentTenantId, String[] tenantIds); + void undateSubmall(String parentTenantId, List tenantIds); List listAsSelectMall(Long id); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxProjectConfigService.java b/mallinkService/src/main/java/com/iformall/service/WxProjectConfigService.java index c7b1493c4..5e4adff0b 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxProjectConfigService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxProjectConfigService.java @@ -38,7 +38,7 @@ public interface WxProjectConfigService { */ void initUserInfo(MallUserInfo userInfo); - void initSubmall(String parentTenantId, String[] tenantIds); + void initSubmall(String parentTenantId, List tenantIds); void initAfterGroup(String tenantId, String tenantIds); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java index 3d7e940fc..b924df956 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java @@ -299,7 +299,7 @@ public class WxMallServiceImpl implements WxMallService { } @Override - public void undateSubmall(String parentTenantId, String[] tenantIds) { + public void undateSubmall(String parentTenantId, List tenantIds) { wxMallMapper.undateSubmall(parentTenantId, tenantIds); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java index 85bccd95f..1c29ba4f5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java @@ -244,7 +244,7 @@ public class WxProjectConfigServiceImpl implements WxProjectConfigService { } @Override - public void initSubmall(String parentTenantId, String[] tenantIds) { + public void initSubmall(String parentTenantId, List tenantIds) { wxMallService.undateSubmall(parentTenantId,tenantIds); } diff --git a/mallinkService/src/main/resources/mapper/WxMallMapper.xml b/mallinkService/src/main/resources/mapper/WxMallMapper.xml index fce078461..358748dc5 100644 --- a/mallinkService/src/main/resources/mapper/WxMallMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMallMapper.xml @@ -193,11 +193,13 @@ update wx_mall set parent_tenant_id = null where parent_tenant_id = #{parentTenantId} ; + update wx_mall set parent_tenant_id = #{parentTenantId} where tenant_id in #{item} +