Просмотр исходного кода

[B端账单][查询][添加请求参数APPID]

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
ad19adab9c
3 измененных файлов: 113 добавлений и 28 удалений
  1. +79
    -9
      mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java
  2. +13
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxBillAll.java
  3. +21
    -19
      mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java

+ 79
- 9
mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java Просмотреть файл

@@ -3,11 +3,16 @@ package com.iformall.controller;

import com.iformall.common.ErrorCode;
import com.iformall.common.ResultData;
import com.iformall.domain.po.WxMerchant;
import com.iformall.domain.po.WxMerchantBUser;
import com.iformall.domain.vo.WxBillAll;
import com.iformall.enums.EnumMerchantBUserStatus;
import com.iformall.enums.EnumMerchantStatus;
import com.iformall.service.WxBillAllService;
import com.iformall.service.WxMerchantBUserService;
import com.iformall.service.WxMerchantService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -31,15 +36,51 @@ public class WxBillController extends BaseController {
@Autowired
WxBillAllService wxBillAllService;

@Autowired
WxMerchantBUserService wxMerchantBUserService;

@Autowired
WxMerchantService wxMerchantService;

@ApiOperation("所有欠缴和待缴的数据")
@PostMapping("listBillOweAndWaitPay")
public ResultData listBillOweAndWaitPay(@RequestBody WxBillAll wxBillAll) {
if(StringUtils.isEmpty(wxBillAll.getTenantId())){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"tenantId为空");


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);
}
if(wxBillAll.getMerchantId()==null){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"merchantId为空");
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);
}

wxBillAll.setTenantId(merchant.getTenantId());
wxBillAll.setMerchantId(merchant.getId());
List<Map<String,Object>> result=wxBillAllService.listBillOweAndWaitPay(wxBillAll);
return new ResultData(result);
}
@@ -47,12 +88,41 @@ public class WxBillController extends BaseController {
@ApiOperation("账单")
@PostMapping("listBill")
public ResultData listBill(@RequestBody WxBillAll wxBillAll) {
if(StringUtils.isEmpty(wxBillAll.getTenantId())){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"tenantId为空");
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);
}
if(wxBillAll.getMerchantId()==null){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"merchantId为空");

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);
}

wxBillAll.setTenantId(merchant.getTenantId());
wxBillAll.setMerchantId(merchant.getId());
return wxBillAllService.listBill(wxBillAll);
}



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

@@ -8,6 +8,10 @@ import java.util.List;
*/
public class WxBillAll {


@io.swagger.annotations.ApiModelProperty(value="appId",name="appId")
private String appId;

@io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId")
private String tenantId;

@@ -44,6 +48,15 @@ public class WxBillAll {
@io.swagger.annotations.ApiModelProperty(value="条数",name="pageSize")
private Integer pageSize;


public String getAppId() {
return appId;
}

public void setAppId(String appId) {
this.appId = appId;
}

public Integer getPageIndex() {
return pageIndex;
}


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

@@ -90,25 +90,27 @@ public class WxBillAllServiceImpl implements WxBillAllService {
wxBillAll.setMonth(month);
}
//账单类型
if (wxBillAll.getBillTypeValue().equals(EnumBillType.RENT.getCode())) {
wxBillAll.setBillTypeValue(EnumBillTypeParam.RENT.getCode());
} else if (wxBillAll.getBillTypeValue().equals(EnumBillType.DEPOSIT.getCode())) {
wxBillAll.setBillTypeValue(null);
ArrayList typeList = new ArrayList();
typeList.add(EnumBillTypeParam.RENT_DEPOSIT.getCode());
typeList.add(EnumBillTypeParam.PROPERTY_DEPOSIT.getCode());
wxBillAll.setTypeList(typeList);
} else if (wxBillAll.getBillTypeValue().equals(EnumBillType.PROPERTY.getCode())) {
wxBillAll.setBillTypeValue(EnumBillTypeParam.PROPERTY.getCode());
} else if (wxBillAll.getBillTypeValue().equals(EnumBillType.WATER.getCode())) {
wxBillAll.setBillTypeValue(EnumBillTypeParam.WATER.getCode());
} else if (wxBillAll.getBillTypeValue().equals(EnumBillType.POWER.getCode())) {
wxBillAll.setBillTypeValue(EnumBillTypeParam.POWER.getCode());
} else if (wxBillAll.getBillTypeValue().equals(EnumBillType.ROUTINE.getCode())) {
wxBillAll.setBillTypeValue(EnumBillTypeParam.ROUTINE.getCode());
} else {
logger.info("账单不存在");
return new ResultData(ErrorCode.BILL_ROUTINE_IS_NOT_FOUND);
if(wxBillAll.getBillTypeValue()!=null){
if (wxBillAll.getBillTypeValue().equals(EnumBillType.RENT.getCode())) {
wxBillAll.setBillTypeValue(EnumBillTypeParam.RENT.getCode());
} else if (wxBillAll.getBillTypeValue().equals(EnumBillType.DEPOSIT.getCode())) {
wxBillAll.setBillTypeValue(null);
ArrayList typeList = new ArrayList();
typeList.add(EnumBillTypeParam.RENT_DEPOSIT.getCode());
typeList.add(EnumBillTypeParam.PROPERTY_DEPOSIT.getCode());
wxBillAll.setTypeList(typeList);
} else if (wxBillAll.getBillTypeValue().equals(EnumBillType.PROPERTY.getCode())) {
wxBillAll.setBillTypeValue(EnumBillTypeParam.PROPERTY.getCode());
} else if (wxBillAll.getBillTypeValue().equals(EnumBillType.WATER.getCode())) {
wxBillAll.setBillTypeValue(EnumBillTypeParam.WATER.getCode());
} else if (wxBillAll.getBillTypeValue().equals(EnumBillType.POWER.getCode())) {
wxBillAll.setBillTypeValue(EnumBillTypeParam.POWER.getCode());
} else if (wxBillAll.getBillTypeValue().equals(EnumBillType.ROUTINE.getCode())) {
wxBillAll.setBillTypeValue(EnumBillTypeParam.ROUTINE.getCode());
} else {
logger.info("账单不存在");
return new ResultData(ErrorCode.BILL_ROUTINE_IS_NOT_FOUND);
}
}
if(wxBillAll.getPageIndex()!=null && wxBillAll.getPageIndex()!=null){
PageHelper.startPage(wxBillAll.getPageIndex(), wxBillAll.getPageSize());


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