Browse Source

bug

release_toaliyun_real
xhxu 5 years ago
parent
commit
9f37b3e0fa
3 changed files with 11 additions and 2 deletions
  1. +2
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java
  2. +7
    -0
      mallinkAdmin/src/main/resources/db/migration/V202011240001__add_sale_type.sql
  3. +2
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java

+ 2
- 1
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java View File

@@ -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());


+ 7
- 0
mallinkAdmin/src/main/resources/db/migration/V202011240001__add_sale_type.sql View File

@@ -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]');





+ 2
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java View File

@@ -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("-", ""));


Loading…
Cancel
Save