ソースを参照

Merge branch 'release_real_202008' of https://git.malls.iformall.com/server/formallProject into release_real_202008

release_toaliyun_real
xiaohanzi 5年前
コミット
0ffdb06790
11個のファイルの変更67行の追加41行の削除
  1. +41
    -30
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java
  2. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java
  3. +6
    -4
      mallinkAdmin/src/main/resources/db/migration/V202007311142__GROUP__ADD_002.sql
  4. +3
    -0
      mallinkAdmin/src/main/resources/db/migration/V202007311200__FOR_MEMBER_ONLY_001.sql
  5. +8
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java
  6. +1
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxMallMapper.java
  7. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxMallService.java
  8. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxProjectConfigService.java
  9. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java
  10. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java
  11. +2
    -0
      mallinkService/src/main/resources/mapper/WxMallMapper.xml

+ 41
- 30
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.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);
@@ -628,17 +629,20 @@ public class WxProjectConfigController extends BaseController {
@PostMapping("/init/submall") @PostMapping("/init/submall")
@SystemControllerLog(description = "子广场-更新") @SystemControllerLog(description = "子广场-更新")
@TenantIgnore @TenantIgnore
public ResultData initSubmall(@RequestBody WxMall wxMall) {
public ResultData initSubmall(@RequestBody Map<String, Object> map) {
logger.debug("[" + getIpAddr() + "] WxProjectConfigController::initSubmall"); logger.debug("[" + getIpAddr() + "] WxProjectConfigController::initSubmall");
try { 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<String> subTenantIds = (List<String>) map.get("subTenantIds");
if(StringUtils.isBlank(tenantId)){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); 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(){{ TenantEntity TenantEntity = new TenantEntity(){{
setTenantId(wxMall.getParentTenantId());
setTenantId(tenantId);
}}; }};
WxMall parentWxMall = wxMallService.getByTenantInfo(TenantEntity); WxMall parentWxMall = wxMallService.getByTenantInfo(TenantEntity);
if(parentWxMall == null || parentWxMall.getSaleType() != 100 if(parentWxMall == null || parentWxMall.getSaleType() != 100
@@ -646,8 +650,7 @@ public class WxProjectConfigController extends BaseController {
|| StringUtils.isNotBlank(parentWxMall.getParentTenantId())){ || StringUtils.isNotBlank(parentWxMall.getParentTenantId())){
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);
} }
String[] tenantIds = wxMall.getTenantId().split(",");
wxProjectConfigService.initSubmall(wxMall.getParentTenantId(),tenantIds);
wxProjectConfigService.initSubmall(tenantId,subTenantIds);


return new ResultData(); return new ResultData();
}catch (Exception e){ }catch (Exception e){
@@ -660,17 +663,23 @@ public class WxProjectConfigController extends BaseController {
@PostMapping("/init/after/group") @PostMapping("/init/after/group")
@SystemControllerLog(description = "商场-数据更新") @SystemControllerLog(description = "商场-数据更新")
@TenantIgnore @TenantIgnore
public ResultData initAfterGroup(@RequestBody WxMall wxMall) {
public ResultData initAfterGroup(@RequestBody Map<String, Object> map) {
logger.debug("[" + getIpAddr() + "] WxProjectConfigController::initAfterGroup"); logger.debug("[" + getIpAddr() + "] WxProjectConfigController::initAfterGroup");
try { try {
if(StringUtils.isBlank(wxMall.getTenantId())){
String tenantId = (String) map.get("tenantId");
List<String> subTenantIds = (List<String>) map.get("subTenantIds");
String subTenantIdStrs = null;

if(StringUtils.isBlank(tenantId)){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); 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(){{ TenantEntity TenantEntity = new TenantEntity(){{
setTenantId(wxMall.getParentTenantId());
setTenantId(tenantId);
}}; }};
WxMall parentWxMall = wxMallService.getByTenantInfo(TenantEntity); WxMall parentWxMall = wxMallService.getByTenantInfo(TenantEntity);
if(parentWxMall == null || parentWxMall.getSaleType() != 100 if(parentWxMall == null || parentWxMall.getSaleType() != 100
@@ -687,7 +696,9 @@ public class WxProjectConfigController extends BaseController {
}else{ }else{
openRedisTemplate.opsForValue().set(key,"1",3000, TimeUnit.SECONDS); 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(); return new ResultData();
}catch (Exception e){ }catch (Exception e){


+ 2
- 2
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 = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
@SystemControllerLog(description = "券投放-列表") @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"); logger.debug("[" + getIpAddr() + "] WxCouponController::list");
if (wxCoupon == null) wxCoupon = new WxCoupon(); if (wxCoupon == null) wxCoupon = new WxCoupon();
if(null != null && type == 1){
if(null != dataType && dataType == 1){
wxCoupon.updateTenantInfo(ifParentUpdateTenantInfo()); wxCoupon.updateTenantInfo(ifParentUpdateTenantInfo());
}else{ }else{
wxCoupon.updateTenantInfo(getTenantInfo()); wxCoupon.updateTenantInfo(getTenantInfo());


+ 6
- 4
mallinkAdmin/src/main/resources/db/migration/V202007311142__GROUP__ADD_002.sql ファイルの表示

@@ -20,10 +20,12 @@ BEGIN
PREPARE stmt_old FROM @old_data_sql; PREPARE stmt_old FROM @old_data_sql;
EXECUTE stmt_old; EXECUTE stmt_old;
DEALLOCATE PREPARE 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; END LOOP;
CLOSE table_cursor; CLOSE table_cursor;
IF err_flag THEN IF err_flag THEN


+ 3
- 0
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` ALTER TABLE `wx_c_user_car`
ADD COLUMN `vendor_person_id` VARCHAR(100) DEFAULT NULL COMMENT '停车场的会员ID'; 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` 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` 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`; MODIFY COLUMN `img_url_h` varchar(250) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '商场图标_横' AFTER `img_url`;


+ 8
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java ファイルの表示

@@ -565,6 +565,14 @@ public class WxUserGrantController extends BaseController {
user.setLanguage(userInfo.getLanguage()); user.setLanguage(userInfo.getLanguage());
wxCUserService.saveOrUpdate(updateUser); 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(); String key = Constant.tokenPrev + user.getToken();
if(baseCUserTokenRedisTemplate.hasKey(key)){ if(baseCUserTokenRedisTemplate.hasKey(key)){
baseCUserTokenRedisTemplate.delete(key); baseCUserTokenRedisTemplate.delete(key);


+ 1
- 1
mallinkService/src/main/java/com/iformall/mapper/WxMallMapper.java ファイルの表示

@@ -18,7 +18,7 @@ public interface WxMallMapper extends CommonMapper<WxMall, Long> {


String queryMenusByTenantInfo(WxMall wxMall); 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<String> tenantIds);


List<WxMall> listAsSelectMall(@Param(value = "id")Long id); List<WxMall> listAsSelectMall(@Param(value = "id")Long id);
} }

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxMallService.java ファイルの表示

@@ -80,7 +80,7 @@ public interface WxMallService {
*/ */
List<WxMall> getSubByParentTenantId(String parentTenantId); List<WxMall> getSubByParentTenantId(String parentTenantId);


void undateSubmall(String parentTenantId, String[] tenantIds);
void undateSubmall(String parentTenantId, List<String> tenantIds);


List<WxMall> listAsSelectMall(Long id); List<WxMall> listAsSelectMall(Long id);
} }

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxProjectConfigService.java ファイルの表示

@@ -38,7 +38,7 @@ public interface WxProjectConfigService {
*/ */
void initUserInfo(MallUserInfo userInfo); void initUserInfo(MallUserInfo userInfo);


void initSubmall(String parentTenantId, String[] tenantIds);
void initSubmall(String parentTenantId, List<String> tenantIds);


void initAfterGroup(String tenantId, String tenantIds); void initAfterGroup(String tenantId, String tenantIds);




+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java ファイルの表示

@@ -299,7 +299,7 @@ public class WxMallServiceImpl implements WxMallService {
} }


@Override @Override
public void undateSubmall(String parentTenantId, String[] tenantIds) {
public void undateSubmall(String parentTenantId, List<String> tenantIds) {
wxMallMapper.undateSubmall(parentTenantId, tenantIds); wxMallMapper.undateSubmall(parentTenantId, tenantIds);
} }




+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxProjectConfigServiceImpl.java ファイルの表示

@@ -244,7 +244,7 @@ public class WxProjectConfigServiceImpl implements WxProjectConfigService {
} }


@Override @Override
public void initSubmall(String parentTenantId, String[] tenantIds) {
public void initSubmall(String parentTenantId, List<String> tenantIds) {
wxMallService.undateSubmall(parentTenantId,tenantIds); wxMallService.undateSubmall(parentTenantId,tenantIds);
} }




+ 2
- 0
mallinkService/src/main/resources/mapper/WxMallMapper.xml ファイルの表示

@@ -193,11 +193,13 @@
<update id="undateSubmall"> <update id="undateSubmall">
update wx_mall set parent_tenant_id = null where parent_tenant_id = #{parentTenantId} ; update wx_mall set parent_tenant_id = null where parent_tenant_id = #{parentTenantId} ;
<if test="tenantIds != null and tenantIds.size > 0">
update wx_mall set parent_tenant_id = #{parentTenantId} where tenant_id in update wx_mall set parent_tenant_id = #{parentTenantId} where tenant_id in
<foreach collection="tenantIds" item="item" index="index" open="(" <foreach collection="tenantIds" item="item" index="index" open="("
separator="," close=")"> separator="," close=")">
#{item} #{item}
</foreach> </foreach>
</if>
</update> </update>






読み込み中…
キャンセル
保存