Parcourir la source

[账单][修改][状态]

release_toaliyun_real
gongbiao il y a 7 ans
Parent
révision
f9617cf219
4 fichiers modifiés avec 15 ajouts et 74 suppressions
  1. +4
    -65
      mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java
  2. +3
    -4
      mallinkService/src/main/java/com/iformall/enums/EnumBillRentStatus.java
  3. +7
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java
  4. +1
    -1
      mallinkService/src/main/resources/mapper/WxBillAllMapper.xml

+ 4
- 65
mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java Voir le fichier

@@ -45,39 +45,6 @@ public class WxBillController extends BaseController {
@PostMapping("listBillOweAndWaitPay")
public ResultData listBillOweAndWaitPay(@RequestBody WxBillAll wxBillAll) {


// WxMerchantBUser wxMerchantBUser = new WxMerchantBUser();
// wxMerchantBUser.setAppId(wxBillAll.getAppId());
// wxMerchantBUser.setStatus(EnumMerchantBUserStatus.VALID.getCode());
// try {
// wxMerchantBUser = wxMerchantBUserService.getBUserByAppId(wxMerchantBUser);
// } catch (Exception e) {
// logger.error(e.getMessage());
// logger.error("B端用户不存在");
// return new ResultData(ErrorCode.USER_IS_EMPTY);
// }
// WxMerchant merchant = null;
// if (wxMerchantBUser != null) {
// // check merchant 状态
// try {
// merchant = wxMerchantService.getById(wxMerchantBUser.getMerchantId());
// } catch (Exception e) {
// logger.error(ErrorCode.DB_FAIL.getMessage() + ": " + wxMerchantBUser.getMerchantId() + e.getMessage());
// return new ResultData(ErrorCode.DB_FAIL);
// }
// if (merchant == null) {
// logger.error(ErrorCode.MERCHANT_INFO_NOT_FOUND.getMessage() + ": " + wxMerchantBUser.getMerchantId());
// return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND);
// }
// if (merchant.getStatus().equals(EnumMerchantStatus.NOT_VALID.getCode())) {
// logger.error(ErrorCode.MERCHANT_INFO_NOT_VALID.getMessage() + ": " + wxMerchantBUser.getMerchantId());
// return new ResultData(ErrorCode.MERCHANT_INFO_NOT_VALID);
// }
// } else {
// logger.error("B端用户不存在");
// return new ResultData(ErrorCode.USER_IS_EMPTY);
// }

if(StringUtils.isEmpty(wxBillAll.getTenantId())){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"tenantId不能为空");
}
@@ -98,38 +65,6 @@ public class WxBillController extends BaseController {
@ApiOperation("账单")
@PostMapping("listBill")
public ResultData listBill(@RequestBody WxBillAll wxBillAll) {
// WxMerchantBUser wxMerchantBUser = new WxMerchantBUser();
// wxMerchantBUser.setAppId(wxBillAll.getAppId());
// wxMerchantBUser.setStatus(EnumMerchantBUserStatus.VALID.getCode());
// try {
// wxMerchantBUser = wxMerchantBUserService.getBUserByAppId(wxMerchantBUser);
// } catch (Exception e) {
// logger.error(e.getMessage());
// logger.error("B端用户不存在");
// return new ResultData(ErrorCode.USER_IS_EMPTY);
// }
//
// WxMerchant merchant = null;
// if (wxMerchantBUser != null) {
// // check merchant 状态
// try {
// merchant = wxMerchantService.getById(wxMerchantBUser.getMerchantId());
// } catch (Exception e) {
// logger.error(ErrorCode.DB_FAIL.getMessage() + ": " + wxMerchantBUser.getMerchantId() + e.getMessage());
// return new ResultData(ErrorCode.DB_FAIL);
// }
// if (merchant == null) {
// logger.error(ErrorCode.MERCHANT_INFO_NOT_FOUND.getMessage() + ": " + wxMerchantBUser.getMerchantId());
// return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND);
// }
// if (merchant.getStatus().equals(EnumMerchantStatus.NOT_VALID.getCode())) {
// logger.error(ErrorCode.MERCHANT_INFO_NOT_VALID.getMessage() + ": " + wxMerchantBUser.getMerchantId());
// return new ResultData(ErrorCode.MERCHANT_INFO_NOT_VALID);
// }
// } else {
// logger.error("B端用户不存在");
// return new ResultData(ErrorCode.USER_IS_EMPTY);
// }

if(StringUtils.isEmpty(wxBillAll.getTenantId())){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"tenantId不能为空");
@@ -144,6 +79,10 @@ public class WxBillController extends BaseController {
if(wxMerchant.getStatus().equals(EnumMerchantStatus.NOT_VALID.getCode())){
return new ResultData(ErrorCode.MERCHANT_INFO_NOT_VALID);
}
if(StringUtils.isEmpty(wxBillAll.getStarttime()) || StringUtils.isEmpty(wxBillAll.getEndtime())){
logger.info("开始时间和结束时间要同时存在或不存在");
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"starttime和endtime要同时存在或不存在");
}
return wxBillAllService.listBill(wxBillAll);
}



+ 3
- 4
mallinkService/src/main/java/com/iformall/enums/EnumBillRentStatus.java Voir le fichier

@@ -6,11 +6,10 @@ package com.iformall.enums;
*/

public enum EnumBillRentStatus {

NOT_EXPIRED(1,"未到期"),
NOT_PAID(1, "欠缴"),
WAIT_PAY(2,"待缴"),
NOT_PAID(3, "欠缴"),
PAID(4, "已结清"),
PAID(3, "已结清"),
NOT_EXPIRED(4,"未到期"),
;

public static EnumBillRentStatus getEnum(Integer code) {


+ 7
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java Voir le fichier

@@ -48,6 +48,8 @@ public class WxBillAllServiceImpl implements WxBillAllService {
@Autowired
WxBillRentService wxBillRentService;

@Autowired
WxBillOtherService wxBillOtherService;

@Override
public Map<String, Object> listAsPage(WxBillAll record, Integer pageIndex, Integer pageSize) {
@@ -86,10 +88,6 @@ public class WxBillAllServiceImpl implements WxBillAllService {
public ResultData listBill(WxBillAll wxBillAll) {
//更新各账单状态
updateBillStatus(wxBillAll);
if(StringUtils.isEmpty(wxBillAll.getStarttime()) && StringUtils.isEmpty(wxBillAll.getEndtime())){
String month = DateUtils.getSystemTime("yyyy-MM");
wxBillAll.setMonth(month);
}
//账单类型
if(wxBillAll.getBillTypeValue()!=null){
if (wxBillAll.getBillTypeValue().equals(EnumBillType.RENT.getCode())) {
@@ -125,6 +123,11 @@ public class WxBillAllServiceImpl implements WxBillAllService {

private void updateBillStatus(WxBillAll record) {
logger.info("更新各账单状态开始");
//更新其他账单
//
WxBillOther wxBillOther = new WxBillOther();
wxBillOther.setTenantId(record.getTenantId());
wxBillOtherService.updateBillStatus(wxBillOther);
//更新日常账单状态
WxBillDaily wxBillDaily = new WxBillDaily();
wxBillDaily.setTenantId(record.getTenantId());


+ 1
- 1
mallinkService/src/main/resources/mapper/WxBillAllMapper.xml Voir le fichier

@@ -123,7 +123,7 @@
<if test=" null != billTypeValue ">
and bill.bill_type_value=#{billTypeValue}
</if>
order by bill.merchant_id,bill.receive_date
order by bill.merchant_id,bill.status,bill.receive_date desc
</select>


Chargement…
Annuler
Enregistrer