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

[品牌][修改][添加LOGO等信息],[C端宣传页][修改][banner排序]

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
eafefbb2c9
5 измененных файлов: 42 добавлений и 4 удалений
  1. +2
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxCampaignController.java
  2. +33
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxBrand.java
  3. +3
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  5. +3
    -0
      mallinkService/src/main/resources/mapper/WxBrandMapper.xml

+ 2
- 1
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 javax.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;


import static com.iformall.domain.po.WxCampaign.Field.CreateTime_ASC;
import static com.iformall.domain.po.WxCampaign.Field.SortNum_ASC; import static com.iformall.domain.po.WxCampaign.Field.SortNum_ASC;


@RestController @RestController
@@ -51,7 +52,7 @@ public class WxCampaignController extends BaseController {


wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode()); wxCampaign.setStatus(EnumCampaignStatus.STATUS_THROW_IN.getCode());
wxCampaign.setTenantId(getTenantId()); wxCampaign.setTenantId(getTenantId());
wxCampaign.setSortColumns(SortNum_ASC);
wxCampaign.setSortColumns(SortNum_ASC, CreateTime_ASC);
final PageInfo<WxCampaign> page = wxCampaignService.listAsPage(wxCampaign, pageNum, pageSize); final PageInfo<WxCampaign> page = wxCampaignService.listAsPage(wxCampaign, pageNum, pageSize);
return new ResultData(page); return new ResultData(page);
} }


+ 33
- 0
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") @io.swagger.annotations.ApiModelProperty(value="修改时间",name="updatetime")
private Date 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() { public String getName() {
return name; return name;
} }
@@ -79,6 +88,30 @@ public class WxBrand implements Serializable {
this.tenantId = tenantId; 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 public static enum Field
{ {
Id_ASC("`id` ASC"),Id_DESC("`id` DESC") Id_ASC("`id` ASC"),Id_DESC("`id` DESC")


+ 3
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java Просмотреть файл

@@ -53,12 +53,13 @@ public class WxBrandServiceImpl implements WxBrandService {
} }
try { try {
final IdWorker idWorker = IdWorker.get(); final IdWorker idWorker = IdWorker.get();
wxBrand.setId(idWorker.nextId());
long id = idWorker.nextId();
wxBrand.setId(id);
Date date = new Date(); Date date = new Date();
wxBrand.setCreatetime(date); wxBrand.setCreatetime(date);
wxBrand.setUpdatetime(date); wxBrand.setUpdatetime(date);
wxBrandMapper.insertSelective(wxBrand); wxBrandMapper.insertSelective(wxBrand);
return new ResultData(Result.SUCCESS, "操作成功");
return new ResultData(Result.SUCCESS, "操作成功", id);
} catch (Exception e) { } catch (Exception e) {
logger.error("保存租赁合同信息失败,e:" + e.getMessage()); logger.error("保存租赁合同信息失败,e:" + e.getMessage());
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage());


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Просмотреть файл

@@ -426,7 +426,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
pDest.mkdirs(); pDest.mkdirs();
} }
try { try {
String exportFileName = wxRentContract.getFilename() + filesuffix;
String exportFileName = wxRentContract.getFilename();
downLoadFromUrl(wxRentContract.getFilepath(), filename, filepath); downLoadFromUrl(wxRentContract.getFilepath(), filename, filepath);
downFile(destPath, wxRentContract.getFilename(), exportFileName, response, request); downFile(destPath, wxRentContract.getFilename(), exportFileName, response, request);
org.apache.commons.io.FileUtils.forceDelete(dest); org.apache.commons.io.FileUtils.forceDelete(dest);


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

@@ -7,6 +7,9 @@
<result column="createtime" jdbcType="TIMESTAMP" property="createtime" /> <result column="createtime" jdbcType="TIMESTAMP" property="createtime" />
<result column="updatetime" jdbcType="TIMESTAMP" property="updatetime" /> <result column="updatetime" jdbcType="TIMESTAMP" property="updatetime" />
<result column="tenant_id" jdbcType="VARCHAR" property="tenantId" /> <result column="tenant_id" jdbcType="VARCHAR" property="tenantId" />
<result column="logo" jdbcType="VARCHAR" property="logo"/>
<result column="summary" jdbcType="VARCHAR" property="summary"/>
</resultMap> </resultMap>
<sql id="allColumns"> <sql id="allColumns">


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