From 9f37b3e0fa1896185473842556bd4894defaaa46 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 25 Nov 2020 10:04:22 +0800 Subject: [PATCH 1/5] bug --- .../controller/basic/WxProjectConfigController.java | 3 ++- .../db/migration/V202011240001__add_sale_type.sql | 7 +++++++ .../iformall/service/impl/WxAuthorizerInfoServiceImpl.java | 3 ++- 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V202011240001__add_sale_type.sql 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/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("-", "")); From 800fabb96825bd479a4ced93fdb7f903bb6574a3 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 25 Nov 2020 10:49:04 +0800 Subject: [PATCH 2/5] bug --- .../java/com/iformall/controller/WxMiniappThemeController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java index 6c119fb37..eadeedf30 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java @@ -48,7 +48,7 @@ public class WxMiniappThemeController extends BaseController { WxMiniappTheme wxMiniappTheme1 = list.get(0); List childList = wxMiniappThemeService.findChildList(wxMiniappTheme1.getId()); wxMiniappTheme1.setWxMiniappThemeValue(childList); - return new ResultData(wxMiniappTheme1); + return new ResultData(childList); }catch (Exception e){ logger.error(e.getMessage(),e); return new ResultData(ErrorCode.SYS_SERVER_ERROR); From 48c25d5c74dc2024916856139010153fbdb31c61 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 25 Nov 2020 11:34:41 +0800 Subject: [PATCH 3/5] bug --- .../java/com/iformall/controller/WxMiniappThemeController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java index eadeedf30..cd5556541 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java @@ -20,7 +20,7 @@ import java.util.List; @RestController @Api(description = "/api/MiniappTheme相关接口") -@RequestMapping("wxMiniappTheme") +@RequestMapping("/api/wxMiniappTheme") public class WxMiniappThemeController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); From 5d1b6467deff8515046c09f2b704e947cb20e1af Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 25 Nov 2020 14:07:09 +0800 Subject: [PATCH 4/5] bug --- .../src/main/resources/mapper/WxMiniappThemeMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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