|
|
|
@@ -221,6 +221,28 @@ public class WxMallAdminController extends BaseController { |
|
|
|
return new ResultData(billAllHelper.getBillList(btype, wxMerchant,pageNum,pageSize)); |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation("账单详情") |
|
|
|
@GetMapping("detail") |
|
|
|
public ResultData detail(@ModelAttribute WxMerchant wxMerchant,Integer billTypeValue,Long billId) { |
|
|
|
if (null == wxMerchant) { |
|
|
|
wxMerchant = new WxMerchant(); |
|
|
|
} |
|
|
|
setQueryDataRule(wxMerchant); |
|
|
|
if (null == billTypeValue || null == billId) { |
|
|
|
return new ResultData(Result.ERROR,"参数错误"); |
|
|
|
} |
|
|
|
EnumBillAllType btype; |
|
|
|
if (billTypeValue.intValue() == Constant.bill_all_type_manage_fee) { |
|
|
|
btype = EnumBillAllType.RENT_BUSSINESS_MANAGE; |
|
|
|
}else { |
|
|
|
btype = EnumBillAllType.getEnum(billTypeValue); |
|
|
|
if (null == btype) { |
|
|
|
return new ResultData(Result.ERROR,"分类非法"); |
|
|
|
} |
|
|
|
} |
|
|
|
return new ResultData(billAllHelper.getBillDetail(btype, wxMerchant,billId)); |
|
|
|
} |
|
|
|
|
|
|
|
//账单汇总 |
|
|
|
@GetMapping("billSum") |
|
|
|
public ResultData billSum(@ModelAttribute WxMerchant wxMerchant) { |
|
|
|
|