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

[统计][修改][完善欠缴商户]

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
be9675ffae
7 измененных файлов: 56 добавлений и 8 удалений
  1. +0
    -7
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java
  2. +22
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java
  3. +6
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java
  4. +5
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java
  5. +6
    -0
      mallinkService/src/main/java/com/iformall/service/WxBillAllService.java
  6. +17
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java
  7. +0
    -1
      mallinkService/src/main/resources/mapper/WxBillAllMapper.xml

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

@@ -180,12 +180,5 @@ public class WxCouponController extends BaseController {
return new ResultData(wxCouponService.findPressData(wxCoupon,pageNum,pageSize));
}

@ApiOperation("商户活动列表信息")
@GetMapping("findByMerchant")
@SystemControllerLog(description = "商户活动列表信息")
public ResultData findByMerchant(@ModelAttribute WxCoupon wxCoupon) {
return new ResultData(wxCouponService.findByMerchant(wxCoupon));
}


}

+ 22
- 0
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java Просмотреть файл

@@ -97,6 +97,28 @@ public class WxBillAllController extends BaseController {
return new ResultData(result);
}

/**
* 代缴商户列表
* @param wxBillAll
* @param pageNum
* @param pageSize
* @return
*/
@GetMapping("waitMerchantlist")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
@SystemControllerLog(description = "费用收缴数据-代缴商户列表")
public ResultData waitMerchantlist(@ModelAttribute WxBillAll wxBillAll, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxBillAllController::waitMerchantlist");
if (null == wxBillAll) {
wxBillAll = new WxBillAll();
}
wxBillAll.setTenantId(getTenantId());
Map<String, Object> result = wxBillAllService.getWaitBillAsPage(wxBillAll, pageNum, pageSize);
return new ResultData(result);
}


@ApiOperation("导出欠缴商户列表")
@GetMapping("/exportOweMerchantlist")


+ 6
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java Просмотреть файл

@@ -80,4 +80,10 @@ public class WxCouponController extends BaseController {
return wxCouponService.list(wxCoupon, pageNum, pageSize); //全列表
}

@ApiOperation("商户活动列表信息")
@GetMapping("findByMerchant")
public ResultData findByMerchant(@ModelAttribute WxCoupon wxCoupon) {
return new ResultData(wxCouponService.findByMerchant(wxCoupon));
}

}

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

@@ -42,4 +42,9 @@ public interface WxBillAllMapper {
*/
List<Map<String, Object>> getOweBillAsPage(WxBillAll record);

/**
* 代缴商户分页列表
* @return
*/
List<Map<String, Object>> getWaitBillAsPage(WxBillAll record);
}

+ 6
- 0
mallinkService/src/main/java/com/iformall/service/WxBillAllService.java Просмотреть файл

@@ -43,6 +43,12 @@ public interface WxBillAllService {
*/
Map<String, Object> getOweBillAsPage(WxBillAll record, Integer pageNum, Integer pageSize);

/**
* 代缴商户分页列表
* @return
*/
Map<String, Object> getWaitBillAsPage(WxBillAll record,Integer pageNum, Integer pageSize);

void exportOweMerchant(WxBillAll record, HttpServletRequest request, HttpServletResponse response);

void updateBillStatus(WxBillAll record);


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

@@ -755,6 +755,23 @@ public class WxBillAllServiceImpl implements WxBillAllService {
return result;
}

@Override
public Map<String, Object> getWaitBillAsPage(WxBillAll record, Integer pageNum, Integer pageSize) {
PageInfo<Map<String, Object>> pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxBillAllMapper.getWaitBillAsPage(record));
List<Map<String, Object>> list = pageInfo.getList();
for (Map<String, Object> map:list) {
map.put("rentOwe",subZeroAndDot(map.get("rentOwe").toString()));
map.put("propertyOwe",subZeroAndDot(map.get("propertyOwe").toString()));
map.put("depositOwe",subZeroAndDot(map.get("depositOwe").toString()));
map.put("otherOwe",subZeroAndDot(map.get("otherOwe").toString()));
map.put("totalOwe",subZeroAndDot(map.get("totalOwe").toString()));
}
pageInfo.setList(list);
Map<String, Object> result = new HashMap<>();
result.put("pageInfo", pageInfo);
return result;
}

/**
* 使用java正则表达式去掉多余的.与0
* @param s


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

@@ -627,5 +627,4 @@
<if test=" null == sortColumns"> order by totalOwe desc </if>
</select>


</mapper>

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