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

[补贴][修改]:支持返回全部,支持券名称查询

release_toaliyun_real
Stormeye Wu 6 лет назад
Родитель
Сommit
c98785e77c
6 измененных файлов: 17 добавлений и 11 удалений
  1. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantSubsidyController.java
  2. +5
    -3
      mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxMerchantSubsidyMapper.java
  4. +3
    -2
      mallinkService/src/main/java/com/iformall/service/WxMerchantSubsidyService.java
  5. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java
  6. +4
    -1
      mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml

+ 2
- 2
mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantSubsidyController.java Просмотреть файл

@@ -57,7 +57,7 @@ public class WxMerchantSubsidyController extends BaseController {
wxMerchantSubsidy.setStatusS(tmpList);
}
}
Map retMap = wxMerchantSubsidyService.sumForSubsidy(wxMerchantSubsidy);
List<Map<String, Object>> retMap = wxMerchantSubsidyService.sumForSubsidy(wxMerchantSubsidy);
return new ResultData(retMap);
}

@@ -67,7 +67,7 @@ public class WxMerchantSubsidyController extends BaseController {
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
@SystemControllerLog(description = "商户-补贴记录-列表")
public ResultData listMonth(@ModelAttribute WxMerchantSubsidy wxMerchantSubsidy, Integer pageNum, Integer pageSize) {
public ResultData listMonth(@ModelAttribute WxMerchantSubsidyVo wxMerchantSubsidy, Integer pageNum, Integer pageSize) {
String ipStr = getIpAddr();
logger.info("subsidy/list: " + ipStr + " :" + wxMerchantSubsidy.toString());
if (wxMerchantSubsidy == null) {


+ 5
- 3
mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java Просмотреть файл

@@ -13,6 +13,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.List;
import java.util.Map;

@RestController
@@ -32,7 +34,7 @@ public class WxMerchantSubsidyController extends BaseController {
WxMerchantBUser user = getUser();
wxMerchantSubsidy.setTenantId(user.getTenantId());
wxMerchantSubsidy.setMerchantId(user.getMerchantId());
Map retMap = wxMerchantSubsidyService.sumForSubsidy(wxMerchantSubsidy);
List<Map<String, Object>> retMap = wxMerchantSubsidyService.sumForSubsidy(wxMerchantSubsidy);
return new ResultData(retMap);
}

@@ -41,10 +43,10 @@ public class WxMerchantSubsidyController extends BaseController {
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
public ResultData listMonth(@ModelAttribute WxMerchantSubsidy wxMerchantSubsidy, Integer pageNum, Integer pageSize) {
public ResultData listMonth(@ModelAttribute WxMerchantSubsidyVo wxMerchantSubsidy, Integer pageNum, Integer pageSize) {
String ipStr = getIpAddr();
logger.info("subsidy/list: " + ipStr + " :" + wxMerchantSubsidy.toString());
if (wxMerchantSubsidy == null) wxMerchantSubsidy = new WxMerchantSubsidy();
if (wxMerchantSubsidy == null) wxMerchantSubsidy = new WxMerchantSubsidyVo();
WxMerchantBUser user = getUser();
wxMerchantSubsidy.setTenantId(user.getTenantId());
wxMerchantSubsidy.setMerchantId(user.getMerchantId());


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

@@ -13,6 +13,6 @@ public interface WxMerchantSubsidyMapper extends CommonMapper<WxMerchantSubsidy,

List<WxMerchantSubsidyVo> findVoList(WxMerchantSubsidy wxMerchantSubsidy);

Map<String, Object> sumVoList(WxMerchantSubsidy wxMerchantSubsidy);
List<Map<String, Object>> sumVoList(WxMerchantSubsidy wxMerchantSubsidy);
}

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

@@ -7,6 +7,7 @@ import com.iformall.domain.vo.WxMerchantSubsidyVo;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;

public interface WxMerchantSubsidyService {
@@ -16,7 +17,7 @@ public interface WxMerchantSubsidyService {
* @param record
* @return
*/
Map<String, Object> sumForSubsidy(WxMerchantSubsidy record);
List<Map<String, Object>> sumForSubsidy(WxMerchantSubsidy record);

/**
* 根据实体查询分页列表
@@ -26,7 +27,7 @@ public interface WxMerchantSubsidyService {
* @param pageSize
* @return
*/
PageInfo<WxMerchantSubsidyVo> listAsPage(WxMerchantSubsidy record, Integer pageIndex, Integer pageSize);
PageInfo<WxMerchantSubsidyVo> listAsPage(WxMerchantSubsidyVo record, Integer pageIndex, Integer pageSize);
/**
* 根据Id获得实体


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

@@ -31,12 +31,12 @@ public class WxMerchantSubsidyServiceImpl implements WxMerchantSubsidyService {
ExcelService excelService;

@Override
public Map<String, Object> sumForSubsidy(WxMerchantSubsidy record) {
public List<Map<String, Object>> sumForSubsidy(WxMerchantSubsidy record) {
return wxMerchantSubsidyMapper.sumVoList(record);
}

@Override
public PageInfo<WxMerchantSubsidyVo> listAsPage(WxMerchantSubsidy record, Integer pageIndex, Integer pageSize) {
public PageInfo<WxMerchantSubsidyVo> listAsPage(WxMerchantSubsidyVo record, Integer pageIndex, Integer pageSize) {
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantSubsidyMapper.findVoList(record));
}



+ 4
- 1
mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml Просмотреть файл

@@ -185,6 +185,9 @@
<if test=" null != startdate and null!=enddate">
and t.`create_date` between #{startdate} and #{enddate}
</if>
<if test=" null != title">
and t.`title` like concat('%', #{title},'%')
</if>
<if test=" null != statusS ">
and t.`status` in
<foreach collection="statusS" index="index" item="sItem" open="(" separator="," close=")">
@@ -200,7 +203,7 @@
<if test=" null != sortColumns"> order by ${sortColumns} </if>
</sql>

<select id="findVoList" parameterType="com.iformall.domain.po.WxMerchantSubsidy" resultMap="VoBaseResultMap">
<select id="findVoList" parameterType="com.iformall.domain.vo.WxMerchantSubsidyVo" resultMap="VoBaseResultMap">
select * from
(
select <include refid="allVoColumns" />


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