diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java
index 838b2b474..64d4578bd 100644
--- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java
+++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java
@@ -182,4 +182,13 @@ public class WxMerchantController extends BaseController {
wxMerchantService.exportData(wxMerchant,request,response);
}
+ @ApiOperation("置顶")
+ @PostMapping("top")
+ @SystemControllerLog(description = "商户-置顶")
+ public ResultData top(@RequestBody WxMerchant wxMerchant) {
+ logger.debug("[" + getIpAddr() + "] WxMerchantController::top");
+ wxMerchant.setTenantId(getTenantId());
+ return wxMerchantService.top(wxMerchant);
+ }
+
}
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905061550__MERCHANT_UPDATE.sql b/mallinkAdmin/src/main/resources/db/migration/V201905061550__MERCHANT_UPDATE.sql
new file mode 100644
index 000000000..51acaa124
--- /dev/null
+++ b/mallinkAdmin/src/main/resources/db/migration/V201905061550__MERCHANT_UPDATE.sql
@@ -0,0 +1 @@
+alter table wx_merchant add column top_time datetime default now() comment '置顶时间';
\ No newline at end of file
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
index 4e3dad6ee..fa4fde46d 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
@@ -5,7 +5,6 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
-import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -182,6 +181,17 @@ public class WxMerchant extends BaseEntity {
@Excel(name="待缴提醒(提前X天)",width = 20,orderNum = "12")
private Integer billSetting;
+ @io.swagger.annotations.ApiModelProperty(value = "置顶时间", name = "topTime")
+ private Date topTime;
+
+ public Date getTopTime() {
+ return topTime;
+ }
+
+ public void setTopTime(Date topTime) {
+ this.topTime = topTime;
+ }
+
public Integer getBillSetting() {
return billSetting;
}
diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java
index ca144a6be..63d16f207 100644
--- a/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java
+++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantService.java
@@ -2,7 +2,6 @@ package com.iformall.service;
import com.github.pagehelper.PageInfo;
import com.iformall.common.ResultData;
-import com.iformall.domain.po.WxLevelConfig;
import com.iformall.domain.po.WxMerchant;
import com.iformall.domain.vo.WxMerchantSimpleVo;
import com.iformall.domain.vo.WxMerchantVo;
@@ -87,4 +86,7 @@ public interface WxMerchantService {
WxMerchant findOne(WxMerchant wxMerchant);
void exportData(WxMerchant wxMerchant, HttpServletRequest request, HttpServletResponse response);
+
+ ResultData top(WxMerchant wxMerchant);
+
}
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
index e917d6345..1c9179c8c 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java
@@ -611,4 +611,17 @@ public class WxMerchantServiceImpl implements WxMerchantService {
excelService.exportExcel(list,null,"商户信息",WxMerchant.class,"商户信息数据.xls",response);
}
+
+ @Override
+ public ResultData top(WxMerchant wxMerchant) {
+ if (wxMerchant == null) {
+ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "未选择要置顶的商户");
+ }
+ if (wxMerchant.getId() == null) {
+ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(), "未选择要置顶的商户");
+ }
+ wxMerchant.setTopTime(new Date());
+ wxMerchantMapper.updateByPrimaryKeySelective(wxMerchant);
+ return new ResultData(Result.SUCCESS, "操作成功");
+ }
}
diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml
index 641b86fc3..83172ea76 100644
--- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml
@@ -205,7 +205,7 @@
and m.`id` = #{id}
-
+ order by m.top_time desc