winter пре 1 година
родитељ
комит
e2682188fe
3 измењених фајлова са 26 додато и 0 уклоњено
  1. +15
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java
  2. +4
    -0
      mallinkService/src/main/java/com/iformall/service/WxFinanceService.java
  3. +7
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java

+ 15
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java Прегледај датотеку

@@ -11,6 +11,7 @@ import com.iformall.domain.po.SysConfig;
import com.iformall.domain.po.WxAllBill;
import com.iformall.domain.po.WxBillPayWay;
import com.iformall.domain.po.WxEnergyFees;
import com.iformall.domain.po.WxFinanceCheckOut;
import com.iformall.domain.po.WxFinanceFinish;
import com.iformall.domain.po.WxFinanceFinishReceive;
import com.iformall.domain.po.WxFinanceReceive;
@@ -769,6 +770,20 @@ public class WxFinanceController extends BaseController {
return new ResultData();
}
@ApiOperation("结账列表")
@GetMapping("checkOutList")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true),
})
public ResultData checkOutList(@ModelAttribute WxFinanceCheckOut record, Integer pageNum, Integer pageSize) {
record.updateTenantInfo(getTenantInfo());
record.setSortColumns("period desc");
PageInfo<WxFinanceFinish> page = wxFinanceService.finishListAsPage(record, pageNum, pageSize);
return new ResultData(page);
}
private boolean isValidPayTime(Date date) {
// SysConfig sysconfig = wxFinanceService.getFinishEndTime(this.getTenantInfo());
// String fdatestr = sysconfig.getConfigItemValue();


+ 4
- 0
mallinkService/src/main/java/com/iformall/service/WxFinanceService.java Прегледај датотеку

@@ -16,6 +16,7 @@ import com.iformall.domain.po.SysConfig;
import com.iformall.domain.po.WxAllBill;
import com.iformall.domain.po.WxBillPayWay;
import com.iformall.domain.po.WxEnergyFeesShop;
import com.iformall.domain.po.WxFinanceCheckOut;
import com.iformall.domain.po.WxFinanceFinish;
import com.iformall.domain.po.WxFinanceFinishReceive;
import com.iformall.domain.po.WxFinanceReceive;
@@ -86,4 +87,7 @@ public interface WxFinanceService {
Integer getReceiveUnFinisedCount(WxFinanceReceive record);
void batchAuditFinishReceive(WxFinanceFinish record,MallUserInfo user);
void deleteFinish(WxFinanceFinish record);
//结账
PageInfo<WxFinanceCheckOut> finishListAsPage(WxFinanceCheckOut record, Integer pageIndex, Integer pageSize);
}

+ 7
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java Прегледај датотеку

@@ -18,6 +18,7 @@ import com.iformall.domain.po.WxBillPayWay;
import com.iformall.domain.po.WxEnergyFees;
import com.iformall.domain.po.WxEnergyFeesSetoff;
import com.iformall.domain.po.WxEnergyFeesShop;
import com.iformall.domain.po.WxFinanceCheckOut;
import com.iformall.domain.po.WxFinanceFinish;
import com.iformall.domain.po.WxFinanceFinishReceive;
import com.iformall.domain.po.WxFinancePrintData;
@@ -1921,6 +1922,12 @@ public class WxFinanceServiceImpl implements WxFinanceService {
wxFinanceFinishMapper.deleteByConditon(record);
}

@Override
public PageInfo<WxFinanceCheckOut> finishListAsPage(WxFinanceCheckOut record, Integer pageIndex, Integer pageSize) {
PageInfo<WxFinanceCheckOut> page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxFinanceCheckOutMapper.findList(record));
return page;
}



}

Loading…
Откажи
Сачувај