Просмотр исходного кода

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

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
127eff9b91
5 измененных файлов: 20 добавлений и 5 удалений
  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. +8
    -2
      mallinkCApi/src/main/java/com/iformall/controller/WxMiniappThemeController.java
  4. +2
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxAuthorizerInfoServiceImpl.java
  5. +1
    -1
      mallinkService/src/main/resources/mapper/WxMiniappThemeMapper.xml

+ 2
- 1
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());


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





+ 8
- 2
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<WxMiniappThemeValue> childList = wxMiniappThemeService.findChildList(wxMiniappTheme1.getId());
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){
logger.error(e.getMessage(),e);
return new ResultData(ErrorCode.SYS_SERVER_ERROR);


+ 2
- 1
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("-", ""));


+ 1
- 1
mallinkService/src/main/resources/mapper/WxMiniappThemeMapper.xml Просмотреть файл

@@ -29,7 +29,7 @@
<if test=" null != status">
and `status` = #{status}
</if>
<if test=" null == sortColumns"> order by create_date asc </if>
order by create_date asc
</sql>

<select id="findList" parameterType="com.iformall.domain.po.WxMiniappTheme" resultMap="BaseResultMap">


Загрузка…
Отмена
Сохранить