|
|
|
@@ -24,6 +24,7 @@ import com.iformall.enums.EnumFlowKey; |
|
|
|
import com.iformall.enums.EnumMerchantStatus; |
|
|
|
import com.iformall.enums.EnumYesOrNo; |
|
|
|
import com.iformall.service.SysConfigService; |
|
|
|
import com.iformall.service.WxAllBillService; |
|
|
|
import com.iformall.service.WxBillActionService; |
|
|
|
import com.iformall.service.WxBillSettleService; |
|
|
|
import com.iformall.service.WxFlowService; |
|
|
|
@@ -79,6 +80,9 @@ public class WxBillController extends BaseController { |
|
|
|
|
|
|
|
@Autowired |
|
|
|
WxPayAccountBillService wxPayAccountBillService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
WxAllBillService wxAllBillService; |
|
|
|
|
|
|
|
/** |
|
|
|
* 账单类型 |
|
|
|
@@ -192,24 +196,11 @@ public class WxBillController extends BaseController { |
|
|
|
@ApiOperation("账单详情") |
|
|
|
@GetMapping("detail") |
|
|
|
public ResultData detail(@ModelAttribute WxMerchant wxMerchant,Integer billTypeValue,Long billId) { |
|
|
|
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,"分类非法"); |
|
|
|
} |
|
|
|
} |
|
|
|
if (null == wxMerchant) { |
|
|
|
wxMerchant = new WxMerchant(); |
|
|
|
} |
|
|
|
wxMerchant.setId(this.getLoginBUser().getMerchantId()); |
|
|
|
wxMerchant.updateTenantInfo(getTenantInfo()); |
|
|
|
return new ResultData(billAllHelper.getBillDetail(btype, wxMerchant,billId)); |
|
|
|
return new ResultData(wxAllBillService.getById(wxMerchant,billId)); |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation("账单操作记录列表") |
|
|
|
|