From 9c750791fd7a7bcfd12a75f47e8e2911516bf33d Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 13 Dec 2021 18:08:39 +0800 Subject: [PATCH] =?UTF-8?q?/=E3=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/app/WxAppinfoController.java | 37 +++++++++++++++++++ .../com/iformall/enums/EnumAppModelType.java | 36 ++++++++++++++++++ .../service/impl/WxTopicServiceImpl.java | 2 + 3 files changed, 75 insertions(+) create mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumAppModelType.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java index 9956b40ca..9f54b9777 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java @@ -5,14 +5,18 @@ import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.po.WxMerchant; +import com.iformall.enums.EnumAppPlat; import com.iformall.enums.EnumPayWay; +import com.iformall.enums.EnumWxTopicType; import com.iformall.exception.MallinkException; import com.iformall.mapper.WxCouponChannelMapper; import com.iformall.mapper.WxCouponMapper; import com.iformall.mapper.WxMerchantMapper; import com.iformall.service.QrCodeService; +import com.iformall.service.WxAppinfoService; import com.iformall.utils.Constant; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; @@ -34,6 +38,9 @@ import java.util.concurrent.Executors; public class WxAppinfoController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Autowired + private WxAppinfoService wxAppinfoService; + @Autowired private WxMerchantMapper wxMerchantMapper; @@ -139,5 +146,35 @@ public class WxAppinfoController extends BaseController { } } + @ApiOperation("查询小程序首页风格") + @GetMapping("/getAppMouldType") + public ResultData getAppMouldType(Integer plat) { + logger.debug("[" + getIpAddr() + "] WxAppinfoController::getAppMouldType"); + if(plat == null){ + plat = EnumAppPlat.WX.getCode(); + } + EnumAppPlat byCode = EnumAppPlat.getByCode(plat); + if(byCode == null){ + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); + } + WxAppinfo cAppInfo = wxAppinfoService.getCAppInfo(ifParentUpdateAloneTenantInfo(), byCode); + return new ResultData(cAppInfo); + } + + @PostMapping("updateAppMouldType") + @SystemControllerLog(description = "修改小程序首页风格") + public ResultData updateAppMouldType(@RequestBody WxAppinfo appinfo) { + logger.debug("[" + getIpAddr() + "] WxAppinfoController::updateAppMouldType"); + if(appinfo == null || appinfo.getId() == null || appinfo.getMouldType() == null){ + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } + WxAppinfo updateAppinfo = new WxAppinfo(); + updateAppinfo.setId(appinfo.getId()); + updateAppinfo.setMouldType(appinfo.getMouldType()); + updateAppinfo.updateTenantInfo(ifParentUpdateAloneTenantInfo()); + wxAppinfoService.saveOrUpdate(updateAppinfo); + return new ResultData(); + } + } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumAppModelType.java b/mallinkService/src/main/java/com/iformall/enums/EnumAppModelType.java new file mode 100644 index 000000000..414ce4059 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumAppModelType.java @@ -0,0 +1,36 @@ +package com.iformall.enums; + +/** + * Created by + */ +public enum EnumAppModelType { + CLASSICS(1, "经典模板"), + NEW_EDITION(2, "新版风格"), + ; + + + public static EnumAppModelType getEnum(Integer code) { + for (EnumAppModelType value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumAppModelType(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java index 4f95f00ae..4e78c5c2e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxTopicServiceImpl.java @@ -214,6 +214,8 @@ public class WxTopicServiceImpl implements WxTopicService { if(wxCouponChannelVoPageInfo != null && wxCouponChannelVoPageInfo.getList() != null && wxCouponChannelVoPageInfo.getList().size() > 0){ record.setCouponList(wxCouponChannelVoPageInfo.getList()); + }else{ + record.setCouponList(new ArrayList<>()); } }