winter 1 год назад
Родитель
Сommit
b5a5d63511
5 измененных файлов: 8 добавлений и 4 удалений
  1. +3
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxFinanceService.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java
  5. +1
    -0
      mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml

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

@@ -9,6 +9,7 @@ import com.iformall.domain.dto.FinanceSetOffDTO;
import com.iformall.domain.po.WxBillPayWay;
import com.iformall.domain.po.WxEnergyFees;
import com.iformall.domain.po.WxFinanceReceive;
import com.iformall.domain.po.WxFinanceReceiveSetoff;
import com.iformall.domain.po.base.BaseEntity;
import com.iformall.domain.po.base.WxBillBaseEntity;
import com.iformall.domain.vo.FinanceBillSetoffSum;
@@ -259,7 +260,7 @@ public class WxFinanceController extends BaseController {
public ResultData receiveList(@ModelAttribute WxFinanceReceive record, Integer pageNum, Integer pageSize) {
record.updateTenantInfo(getTenantInfo());
record.setSortColumns(BaseEntity.SortField.CreateTime_DESC);
PageInfo<WxFinanceReceiveVo> page = wxFinanceService.receiveListAsPage(record, pageNum, pageSize);
PageInfo<WxFinanceReceiveVo> page = wxFinanceService.receiveVoListAsPage(record, pageNum, pageSize);
return new ResultData(page);
}
@@ -300,7 +301,7 @@ public class WxFinanceController extends BaseController {
public ResultData receiveSetoffList(@ModelAttribute WxFinanceReceive record, Integer pageNum, Integer pageSize) {
record.updateTenantInfo(getTenantInfo());
record.setSortColumns(BaseEntity.SortField.CreateTime_DESC);
PageInfo<WxFinanceReceive> page = wxFinanceService.receiveListAsPage(record, pageNum, pageSize);
PageInfo<WxFinanceReceiveSetoff> page = wxFinanceService.receiveSetoffListAsPage(record, pageNum, pageSize);
return new ResultData(page);
}


+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java Просмотреть файл

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

}

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

@@ -26,7 +26,7 @@ public interface WxFinanceService {
void payWayInit(TenantEntity tenantInfo);
//收款
PageInfo<WxFinanceReceiveVo> receiveListAsPage(WxFinanceReceive record, Integer pageIndex, Integer pageSize);
PageInfo<WxFinanceReceiveVo> receiveVoListAsPage(WxFinanceReceive record, Integer pageIndex, Integer pageSize);
List<WxBillBaseEntity> createReceive(WxFinanceReceive record,MallUserInfo user);
WxFinanceReceive getReceiveById(TenantEntity tenantEntity,Long id);
void invalidReceive(WxFinanceReceive record,MallUserInfo user,String remark);


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

@@ -399,7 +399,7 @@ public class WxFinanceServiceImpl implements WxFinanceService {
}
@Override
public PageInfo<WxFinanceReceiveVo> receiveListAsPage(WxFinanceReceive record, Integer pageIndex, Integer pageSize) {
public PageInfo<WxFinanceReceiveVo> receiveVoListAsPage(WxFinanceReceive record, Integer pageIndex, Integer pageSize) {
initQueryParam(record);
PageInfo<WxFinanceReceive> page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxFinanceReceiveMapper.findList(record));
PageInfo<WxFinanceReceiveVo> pageVo = new PageInfo<WxFinanceReceiveVo>();


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

@@ -44,6 +44,7 @@
<if test=" null != createTimeEnd ">and `create_time` &lt;= #{createTimeEnd}</if>
<if test=" null != feesId ">and `fees_id` = #{feesId}</if>
<if test=" null != isPrint ">and `is_print` = #{isPrint}</if>
<if test=" null != finishStatus ">and `status` in (1,4)</if>
<if test=" null != merchantIdList ">
and merchant_id in
<foreach collection="merchantIdList" index="index" item="midItem" open="(" separator="," close=")">


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