| @@ -293,7 +293,8 @@ public class WxProjectConfigController extends BaseController { | |||||
| if(wxAuthorizerInfo == null){ | if(wxAuthorizerInfo == null){ | ||||
| wxAuthorizerInfo = new WxAuthorizerInfo(); | wxAuthorizerInfo = new WxAuthorizerInfo(); | ||||
| } | } | ||||
| wxAuthorizerInfo.updateTenantInfo(wxAppinfo); | |||||
| // wxAuthorizerInfo.updateTenantInfo(wxAppinfo); | |||||
| wxAuthorizerInfo.setTenantId(wxAppinfo.getTenantId()); | |||||
| wxAuthorizerInfo.setType(wxAppinfo.getType()); | wxAuthorizerInfo.setType(wxAppinfo.getType()); | ||||
| wxAuthorizerInfo.setAuthorizerAppid(wxAppinfo.getAppId()); | wxAuthorizerInfo.setAuthorizerAppid(wxAppinfo.getAppId()); | ||||
| @@ -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]'); | |||||
| @@ -16,11 +16,13 @@ import org.slf4j.LoggerFactory; | |||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| import org.springframework.web.bind.annotation.*; | import org.springframework.web.bind.annotation.*; | ||||
| import java.util.HashMap; | |||||
| import java.util.List; | import java.util.List; | ||||
| import java.util.Map; | |||||
| @RestController | @RestController | ||||
| @Api(description = "/api/MiniappTheme相关接口") | @Api(description = "/api/MiniappTheme相关接口") | ||||
| @RequestMapping("wxMiniappTheme") | |||||
| @RequestMapping("/api/wxMiniappTheme") | |||||
| public class WxMiniappThemeController extends BaseController { | public class WxMiniappThemeController extends BaseController { | ||||
| private final Logger logger = LoggerFactory.getLogger(this.getClass()); | private final Logger logger = LoggerFactory.getLogger(this.getClass()); | ||||
| @@ -48,7 +50,11 @@ public class WxMiniappThemeController extends BaseController { | |||||
| WxMiniappTheme wxMiniappTheme1 = list.get(0); | WxMiniappTheme wxMiniappTheme1 = list.get(0); | ||||
| List<WxMiniappThemeValue> childList = wxMiniappThemeService.findChildList(wxMiniappTheme1.getId()); | List<WxMiniappThemeValue> childList = wxMiniappThemeService.findChildList(wxMiniappTheme1.getId()); | ||||
| wxMiniappTheme1.setWxMiniappThemeValue(childList); | wxMiniappTheme1.setWxMiniappThemeValue(childList); | ||||
| return new ResultData(wxMiniappTheme1); | |||||
| Map<String,WxMiniappThemeValue> map = new HashMap<String,WxMiniappThemeValue>(); | |||||
| for (WxMiniappThemeValue v:childList) { | |||||
| map.put(v.getName(),v); | |||||
| } | |||||
| return new ResultData(map); | |||||
| }catch (Exception e){ | }catch (Exception e){ | ||||
| logger.error(e.getMessage(),e); | logger.error(e.getMessage(),e); | ||||
| return new ResultData(ErrorCode.SYS_SERVER_ERROR); | return new ResultData(ErrorCode.SYS_SERVER_ERROR); | ||||
| @@ -165,7 +165,8 @@ public class WxAuthorizerInfoServiceImpl implements WxAuthorizerInfoService { | |||||
| WxAppinfo appinfo = appinfoMapper.findByAppId(record.getAuthorizerAppid()); | WxAppinfo appinfo = appinfoMapper.findByAppId(record.getAuthorizerAppid()); | ||||
| if(appinfo != null) { | if(appinfo != null) { | ||||
| record.setId(appinfo.getId()); | record.setId(appinfo.getId()); | ||||
| record.updateTenantInfo(appinfo.getTenantInfo()); | |||||
| // record.updateTenantInfo(appinfo.getTenantInfo()); | |||||
| record.setTenantId(appinfo.getTenantId()); | |||||
| record.setType(appinfo.getType()); | record.setType(appinfo.getType()); | ||||
| } else { | } else { | ||||
| //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); | ||||
| @@ -29,7 +29,7 @@ | |||||
| <if test=" null != status"> | <if test=" null != status"> | ||||
| and `status` = #{status} | and `status` = #{status} | ||||
| </if> | </if> | ||||
| <if test=" null == sortColumns"> order by create_date asc </if> | |||||
| order by create_date asc | |||||
| </sql> | </sql> | ||||
| <select id="findList" parameterType="com.iformall.domain.po.WxMiniappTheme" resultMap="BaseResultMap"> | <select id="findList" parameterType="com.iformall.domain.po.WxMiniappTheme" resultMap="BaseResultMap"> | ||||