From eafefbb2c94347b94361439ffd75b26d98ced648 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 26 Dec 2018 14:25:54 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=93=81=E7=89=8C][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0LOGO=E7=AD=89=E4=BF=A1=E6=81=AF],[C=E7=AB=AF?= =?UTF-8?q?=E5=AE=A3=E4=BC=A0=E9=A1=B5][=E4=BF=AE=E6=94=B9][banner?= =?UTF-8?q?=E6=8E=92=E5=BA=8F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCampaignController.java | 3 +- .../java/com/iformall/domain/po/WxBrand.java | 33 +++++++++++++++++++ .../service/impl/WxBrandServiceImpl.java | 5 +-- .../impl/WxRentContractServiceImpl.java | 2 +- .../main/resources/mapper/WxBrandMapper.xml | 3 ++ 5 files changed, 42 insertions(+), 4 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java index 6930a0970..ca32ed72c 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java @@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import java.util.List; +import static com.iformall.domain.po.WxCampaign.Field.CreateTime_ASC; import static com.iformall.domain.po.WxCampaign.Field.SortNum_ASC; @RestController @@ -51,7 +52,7 @@ public class WxCampaignController extends BaseController { wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); wxCampaign.setTenantId(getTenantId()); - wxCampaign.setSortColumns(SortNum_ASC); + wxCampaign.setSortColumns(SortNum_ASC, CreateTime_ASC); final PageInfo page = wxCampaignService.listAsPage(wxCampaign, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java index d135a959c..c94768f8f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java @@ -52,6 +52,15 @@ public class WxBrand implements Serializable { @io.swagger.annotations.ApiModelProperty(value="修改时间",name="updatetime") private Date updatetime; + @io.swagger.annotations.ApiModelProperty(value = "Logo", name = "logo") + private Date logo; + + @io.swagger.annotations.ApiModelProperty(value = "简介", name = "summary") + private Date summary; + + @io.swagger.annotations.ApiModelProperty(value = "创始时间", name = "createdate") + private Date createdate; + public String getName() { return name; } @@ -79,6 +88,30 @@ public class WxBrand implements Serializable { this.tenantId = tenantId; } + public Date getLogo() { + return logo; + } + + public void setLogo(Date logo) { + this.logo = logo; + } + + public Date getSummary() { + return summary; + } + + public void setSummary(Date summary) { + this.summary = summary; + } + + public Date getCreatedate() { + return createdate; + } + + public void setCreatedate(Date createdate) { + this.createdate = createdate; + } + public static enum Field { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java index 17b84c79e..a852b0ad3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java @@ -53,12 +53,13 @@ public class WxBrandServiceImpl implements WxBrandService { } try { final IdWorker idWorker = IdWorker.get(); - wxBrand.setId(idWorker.nextId()); + long id = idWorker.nextId(); + wxBrand.setId(id); Date date = new Date(); wxBrand.setCreatetime(date); wxBrand.setUpdatetime(date); wxBrandMapper.insertSelective(wxBrand); - return new ResultData(Result.SUCCESS, "操作成功"); + return new ResultData(Result.SUCCESS, "操作成功", id); } catch (Exception e) { logger.error("保存租赁合同信息失败,e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 2caa5dacc..00e19aa07 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -426,7 +426,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { pDest.mkdirs(); } try { - String exportFileName = wxRentContract.getFilename() + filesuffix; + String exportFileName = wxRentContract.getFilename(); downLoadFromUrl(wxRentContract.getFilepath(), filename, filepath); downFile(destPath, wxRentContract.getFilename(), exportFileName, response, request); org.apache.commons.io.FileUtils.forceDelete(dest); diff --git a/mallinkService/src/main/resources/mapper/WxBrandMapper.xml b/mallinkService/src/main/resources/mapper/WxBrandMapper.xml index 5b4031b2c..e2e9f4b26 100644 --- a/mallinkService/src/main/resources/mapper/WxBrandMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBrandMapper.xml @@ -7,6 +7,9 @@ + + +