Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
ad859ed5ed
3 changed files with 21 additions and 0 deletions
  1. +16
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java
  3. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java

+ 16
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java View File

@@ -369,6 +369,22 @@ public class WxFinanceController extends BaseController {
return new ResultData(page); return new ResultData(page);
} }
@ApiOperation("过账列表")
@GetMapping("finishReceiveList")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true),
})
public ResultData finishList(@ModelAttribute WxFinanceReceive record, Integer pageNum, Integer pageSize) {
if (null == record.getFinishId()) {
return new ResultData(Result.ERROR,"finishId参数不能为空");
}
record.updateTenantInfo(getTenantInfo());
record.setSortColumns(BaseEntity.SortField.CreateTime_DESC);
PageInfo<WxFinanceReceiveVo> page = wxFinanceService.receiveVoListAsPage(record, pageNum, pageSize);
return new ResultData(page);
}
@ApiOperation("过账") @ApiOperation("过账")
@PostMapping("receiveFinish") @PostMapping("receiveFinish")
public ResultData receiveFinish(@RequestBody WxFinanceReceive record) { public ResultData receiveFinish(@RequestBody WxFinanceReceive record) {


+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java View File

@@ -158,5 +158,7 @@ public class WxFinanceReceive extends TenantEntity {
private String shopIds; private String shopIds;
@TableField(exist = false) @TableField(exist = false)
private Integer finishStatus; private Integer finishStatus;
@TableField(exist = false)
private Long finishId;


} }

+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxFinancePrintServiceImpl.java View File

@@ -115,6 +115,9 @@ public class WxFinancePrintServiceImpl implements WxFinancePrintService {
t.setUpdateTime(new Date()); t.setUpdateTime(new Date());
t.setName(t.getName()+"复制"); t.setName(t.getName()+"复制");
t.setIsDel(EnumYesOrNo.NO.getCode()); t.setIsDel(EnumYesOrNo.NO.getCode());
if (StringUtils.isNotBlank(t.getContent())) {
t.setContent(t.getContent().replaceAll("uuid", "olduuid"));
}
wxFinancePrintTemplateMapper.insert(t); wxFinancePrintTemplateMapper.insert(t);
} }




Loading…
Cancel
Save