From 13b9626a75b13c06b90cff30d5345851dfbd28c5 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 10 Jan 2019 13:06:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[EXCEPTION][=E4=BF=AE=E6=94=B9]:=E6=89=AB?= =?UTF-8?q?=E7=A0=81=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/WxMerchantController.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java index 8fa77063b..8ea4f39ad 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMerchantController.java @@ -7,6 +7,7 @@ import com.iformall.service.WxMerchantService; import com.iformall.utils.HashUtil; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -34,9 +35,13 @@ public class WxMerchantController extends BaseController { if(merchantCode == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } + String codeMD5 = HashUtil.DecodeByMD5(merchantCode); + if(StringUtils.isBlank(codeMD5)) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } HashMap params = new HashMap(); params.put("tenantId", getTenantId()); - params.put("merchantCode", HashUtil.DecodeByMD5(merchantCode)); + params.put("merchantCode", codeMD5); WxMerchantVo wxMerchant = wxMerchantService.getMerchantInfo(params); return new ResultData(wxMerchant); } From f722381f9a6a67950e15c3eb91a7ef04b401079e Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 10 Jan 2019 15:14:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[banner=E5=9B=BE][=E4=BC=98=E5=8C=96]:list?= =?UTF-8?q?=E5=8F=AA=E8=BF=94=E5=9B=9E=E7=9B=B8=E5=85=B3=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E9=9C=80=E8=A6=81html=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCampaignController.java | 5 +---- .../com/iformall/mapper/WxCampaignMapper.java | 2 ++ .../com/iformall/service/WxCampaignService.java | 16 ++++++++++++---- .../service/impl/WxCampaignServiceImpl.java | 5 +++++ .../main/resources/mapper/WxCampaignMapper.xml | 11 ++++++++++- 5 files changed, 30 insertions(+), 9 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java index ca32ed72c..bbd4b1f6e 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java @@ -10,7 +10,6 @@ import com.iformall.enums.EnumCampaignStatus; import com.iformall.enums.EnumCouponChannelType; import com.iformall.service.WxCampaignService; import com.iformall.service.WxCouponChannelService; -import com.iformall.service.WxCouponService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -38,8 +37,6 @@ public class WxCampaignController extends BaseController { @Autowired private WxCampaignService wxCampaignService; @Autowired - private WxCouponService wxCouponService; - @Autowired private WxCouponChannelService wxCouponChannelService; @ApiOperation("分页列表接口") @@ -53,7 +50,7 @@ public class WxCampaignController extends BaseController { wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); wxCampaign.setTenantId(getTenantId()); wxCampaign.setSortColumns(SortNum_ASC, CreateTime_ASC); - final PageInfo page = wxCampaignService.listAsPage(wxCampaign, pageNum, pageSize); + final PageInfo page = wxCampaignService.clistAsPage(wxCampaign, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCampaignMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCampaignMapper.java index bc72cb211..cb7d9559c 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCampaignMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCampaignMapper.java @@ -9,6 +9,8 @@ public interface WxCampaignMapper extends CommonMapper { List findList(WxCampaign wxCampaign); + List findCList(WxCampaign wxCampaign); + int getMaxSortNum(String tenantId); diff --git a/mallinkService/src/main/java/com/iformall/service/WxCampaignService.java b/mallinkService/src/main/java/com/iformall/service/WxCampaignService.java index 3e03fcc45..691d0138f 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCampaignService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCampaignService.java @@ -8,15 +8,23 @@ import javax.servlet.http.HttpServletResponse; public interface WxCampaignService { - /** + /** * 根据实体查询分页列表 - * * @param record - * @param offset - * @param limit + * @param pageIndex + * @param pageSize * @return */ PageInfo listAsPage(WxCampaign record, Integer pageIndex, Integer pageSize); + + /** + * 根据实体查询分页列表 + * @param record + * @param pageIndex + * @param pageSize + * @return + */ + PageInfo clistAsPage(WxCampaign record, Integer pageIndex, Integer pageSize); /** * 根据Id获得实体 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java index 185116679..8e084451a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java @@ -56,6 +56,11 @@ public class WxCampaignServiceImpl implements WxCampaignService { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCampaignMapper.findList(record)); } + @Override + public PageInfo clistAsPage(WxCampaign record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCampaignMapper.findCList(record)); + } + @Override public WxCampaign getById(Long id) { WxCampaign wxCampaign = wxCampaignMapper.selectByPrimaryKey(id); diff --git a/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml b/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml index 77101d9cd..8bd102692 100644 --- a/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCampaignMapper.xml @@ -26,7 +26,11 @@ `id`,`tenant_id`,`cover_img`,`title`,`sub_title`,`use_price`,`discount_price`,`detail`,`valid_start_date`,`valid_end_date`,`img_detail`,`type`,`coupon_ids`, - `mechant_id`,`sort_num`,`status`,`create_time`,`update_time`,`html` + `mechant_id`,`sort_num`,`status`,`create_time`,`update_time` + + + + `id`,`tenant_id`,`cover_img`,`title`,`sort_num` @@ -135,6 +139,11 @@ + +