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 8e13ceee7..f8f4ee0ff 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java @@ -293,7 +293,8 @@ public class WxProjectConfigController extends BaseController { if(wxAuthorizerInfo == null){ wxAuthorizerInfo = new WxAuthorizerInfo(); } - wxAuthorizerInfo.updateTenantInfo(wxAppinfo); +// wxAuthorizerInfo.updateTenantInfo(wxAppinfo); + wxAuthorizerInfo.setTenantId(wxAppinfo.getTenantId()); wxAuthorizerInfo.setType(wxAppinfo.getType()); wxAuthorizerInfo.setAuthorizerAppid(wxAppinfo.getAppId()); diff --git a/mallinkAdmin/src/main/resources/db/migration/V202011240001__add_sale_type.sql b/mallinkAdmin/src/main/resources/db/migration/V202011240001__add_sale_type.sql new file mode 100644 index 000000000..61f04e3b3 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V202011240001__add_sale_type.sql @@ -0,0 +1,7 @@ + +INSERT INTO `mall_sale_type`(`id`,`name`, `type`, `period`, `menus`) +VALUES(4, '速享试用版', 4, 12, '[2, 4, 5, 6, 7, 10, 50, 201, 202, 205, 211, 212, 221, 222, 251, 409, 410, 411, 416, 418, 501, 502, 503, 504, 505, 506, 507, 508, 511, 512, 513, 521, 522, 523, 531, 532, 591, 601, 602, 604, 605, 606, 607, 608, 610, 611, 612, 622, 623, 624, 625, 626, 641, 642, 643, 644, 661, 662, 663, 671, 672, 674, 675, 681, 682, 684, 685, 686, 691, 692, 693, 694, 695, 711, 901, 902, 931, 932]'); + + + + diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java index 6c119fb37..41f6ae8e0 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java @@ -16,11 +16,13 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.HashMap; import java.util.List; +import java.util.Map; @RestController @Api(description = "/api/MiniappTheme相关接口") -@RequestMapping("wxMiniappTheme") +@RequestMapping("/api/wxMiniappTheme") public class WxMiniappThemeController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); @@ -48,7 +50,11 @@ public class WxMiniappThemeController extends BaseController { WxMiniappTheme wxMiniappTheme1 = list.get(0); List childList = wxMiniappThemeService.findChildList(wxMiniappTheme1.getId()); wxMiniappTheme1.setWxMiniappThemeValue(childList); - return new ResultData(wxMiniappTheme1); + Map map = new HashMap(); + for (WxMiniappThemeValue v:childList) { + map.put(v.getName(),v); + } + return new ResultData(map); }catch (Exception e){ logger.error(e.getMessage(),e); return new ResultData(ErrorCode.SYS_SERVER_ERROR); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java index 0a695d9b5..72e259c70 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java @@ -165,7 +165,8 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { WxAppinfo appinfo = appinfoMapper.findByAppId(record.getAuthorizerAppid()); if(appinfo != null) { record.setId(appinfo.getId()); - record.updateTenantInfo(appinfo.getTenantInfo()); +// record.updateTenantInfo(appinfo.getTenantInfo()); + record.setTenantId(appinfo.getTenantId()); record.setType(appinfo.getType()); } else { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); diff --git a/mallinkService/src/main/resources/mapper/WxMiniappThemeMapper.xml b/mallinkService/src/main/resources/mapper/WxMiniappThemeMapper.xml index 41d2d237f..0dc10fe71 100644 --- a/mallinkService/src/main/resources/mapper/WxMiniappThemeMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMiniappThemeMapper.xml @@ -29,7 +29,7 @@ and `status` = #{status} - order by create_date asc + order by create_date asc