Explorar el Código

fix

release_toaliyun_real
winter hace 1 año
padre
commit
177b844d3f
Se han modificado 2 ficheros con 11 adiciones y 1 borrados
  1. +4
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java
  2. +7
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java

+ 4
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxBillDaily.java Ver fichero

@@ -58,6 +58,10 @@ public class WxBillDaily extends WxBillBaseEntity {
private Long shopId; private Long shopId;
@io.swagger.annotations.ApiModelProperty(value="商铺",name="shopName") @io.swagger.annotations.ApiModelProperty(value="商铺",name="shopName")
private String shopName; private String shopName;
@Override
public String getShopNumber() {
return shopName;
}


@io.swagger.annotations.ApiModelProperty(value = "费用明细", name = "priceDetail") @io.swagger.annotations.ApiModelProperty(value = "费用明细", name = "priceDetail")
private String priceDetail; private String priceDetail;


+ 7
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxBillDailyServiceImpl.java Ver fichero

@@ -15,6 +15,7 @@ import com.iformall.domain.po.WxBillPayWay;
import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxMerchant;
import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.po.WxMerchantBUser;
import com.iformall.domain.po.WxPayAccountBill; import com.iformall.domain.po.WxPayAccountBill;
import com.iformall.domain.po.WxShop;
import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.WxBillDailyExportVo; import com.iformall.domain.vo.WxBillDailyExportVo;
import com.iformall.domain.vo.WxBillDailyVo; import com.iformall.domain.vo.WxBillDailyVo;
@@ -35,6 +36,7 @@ import com.iformall.service.WxBillDailyService;
import com.iformall.service.WxFinanceService; import com.iformall.service.WxFinanceService;
import com.iformall.service.WxMerchantService; import com.iformall.service.WxMerchantService;
import com.iformall.service.WxPayAccountBillService; import com.iformall.service.WxPayAccountBillService;
import com.iformall.service.WxShopService;
import com.iformall.service.helper.WxBillAllHelper; import com.iformall.service.helper.WxBillAllHelper;
import com.iformall.utils.Constant; import com.iformall.utils.Constant;
import com.iformall.utils.DateUtils; import com.iformall.utils.DateUtils;
@@ -90,6 +92,10 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD
@Lazy @Lazy
@Autowired @Autowired
WxFinanceService wxFinanceService; WxFinanceService wxFinanceService;
@Lazy
@Autowired
WxShopService wxShopService;


@Override @Override
public PageInfo<WxBillDaily> listAsPage(WxBillDaily record, Integer pageIndex, Integer pageSize) { public PageInfo<WxBillDaily> listAsPage(WxBillDaily record, Integer pageIndex, Integer pageSize) {
@@ -152,7 +158,7 @@ public class WxBillDailyServiceImpl extends WxBillBaseService implements WxBillD
//手续费 = 合同应收+手续费+滞纳金 //手续费 = 合同应收+手续费+滞纳金
computeTotalMoney(wxPayAccountBill, e); computeTotalMoney(wxPayAccountBill, e);
if (null != e.getMerchantId()) {
if (null != e.getMerchantId() && null != merchantMap ) {
WxMerchant m = merchantMap.get(e.getMerchantId()); WxMerchant m = merchantMap.get(e.getMerchantId());
if (null != m ) { if (null != m ) {
e.setMerchantName(m.getName()); e.setMerchantName(m.getName());


Cargando…
Cancelar
Guardar