Преглед на файлове

fix

release_toaliyun_real
winter преди 1 година
родител
ревизия
77e195a121
променени са 6 файла, в които са добавени 50 реда и са изтрити 0 реда
  1. +10
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java
  2. +16
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxFinanceReceiveBillSum.java
  3. +4
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxFinanceReceiveBillMapper.java
  4. +2
    -0
      mallinkService/src/main/java/com/iformall/service/WxFinanceService.java
  5. +7
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java
  6. +11
    -0
      mallinkService/src/main/resources/mapper/WxFinanceReceiveBillMapper.xml

+ 10
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java Целия файл

@@ -19,6 +19,7 @@ import com.iformall.domain.po.WxFinanceReceiveSetoff;
import com.iformall.domain.po.WxFlowModel; import com.iformall.domain.po.WxFlowModel;
import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.base.BaseEntity;
import com.iformall.domain.vo.FinanceBillSetoffSum; import com.iformall.domain.vo.FinanceBillSetoffSum;
import com.iformall.domain.vo.WxFinanceReceiveBillSum;
import com.iformall.domain.vo.WxFinanceReceiveSumVo; import com.iformall.domain.vo.WxFinanceReceiveSumVo;
import com.iformall.domain.vo.WxFinanceReceiveVo; import com.iformall.domain.vo.WxFinanceReceiveVo;
import com.iformall.enums.EnumBillAllType; import com.iformall.enums.EnumBillAllType;
@@ -439,6 +440,15 @@ public class WxFinanceController extends BaseController {
return new ResultData(page); return new ResultData(page);
} }
@ApiOperation("收款记录子账单求和")
@GetMapping("receiveBillSum")
public ResultData receiveBillSum(@ModelAttribute WxFinanceReceiveBill record) {
record.updateTenantInfo(getTenantInfo());
record.setSortColumns(BaseEntity.SortField.CreateTime_DESC);
WxFinanceReceiveBillSum sum = wxFinanceService.receiveBillSum(record);
return new ResultData(sum);
}
@ApiOperation("收款记录子账单列表") @ApiOperation("收款记录子账单列表")
@GetMapping("receiveBillListExport") @GetMapping("receiveBillListExport")
@ApiImplicitParams({ @ApiImplicitParams({


+ 16
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxFinanceReceiveBillSum.java Целия файл

@@ -0,0 +1,16 @@
package com.iformall.domain.vo;

import lombok.Data;
import java.io.Serializable;

@Data
public class WxFinanceReceiveBillSum implements Serializable {

private static final long serialVersionUID = 1L;
//收款总金额
private String receive = "0";
//付款总金额
private String pay = "0";
}

+ 4
- 0
mallinkService/src/main/java/com/iformall/mapper/WxFinanceReceiveBillMapper.java Целия файл

@@ -2,6 +2,8 @@ package com.iformall.mapper;


import com.iformall.common.CommonMapper; import com.iformall.common.CommonMapper;
import com.iformall.domain.po.WxFinanceReceiveBill; import com.iformall.domain.po.WxFinanceReceiveBill;
import com.iformall.domain.vo.WxFinanceReceiveBillSum;

import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;


@@ -16,5 +18,7 @@ public interface WxFinanceReceiveBillMapper extends CommonMapper<WxFinanceReceiv
void deleteByConditon(WxFinanceReceiveBill wxBillRent); void deleteByConditon(WxFinanceReceiveBill wxBillRent);
List<Long> findBillIdList(WxFinanceReceiveBill wxBillRent); List<Long> findBillIdList(WxFinanceReceiveBill wxBillRent);
WxFinanceReceiveBillSum findSum(WxFinanceReceiveBill wxBillRent);
} }

+ 2
- 0
mallinkService/src/main/java/com/iformall/service/WxFinanceService.java Целия файл

@@ -23,6 +23,7 @@ import com.iformall.domain.po.WxFinanceReceivePayway;
import com.iformall.domain.po.WxFinanceReceiveSetoff; import com.iformall.domain.po.WxFinanceReceiveSetoff;
import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.FinanceBillSetoffSum; import com.iformall.domain.vo.FinanceBillSetoffSum;
import com.iformall.domain.vo.WxFinanceReceiveBillSum;
import com.iformall.domain.vo.WxFinanceReceiveSumVo; import com.iformall.domain.vo.WxFinanceReceiveSumVo;
import com.iformall.domain.vo.WxFinanceReceiveVo; import com.iformall.domain.vo.WxFinanceReceiveVo;
/** /**
@@ -41,6 +42,7 @@ public interface WxFinanceService {
PageInfo<WxFinanceReceiveVo> receiveVoListWithBillsAsPage(WxFinanceReceive record, Integer pageIndex, Integer pageSize); PageInfo<WxFinanceReceiveVo> receiveVoListWithBillsAsPage(WxFinanceReceive record, Integer pageIndex, Integer pageSize);
PageInfo<WxFinanceReceiveVo> receiveVoListAsPage(WxFinanceReceive record, Integer pageIndex, Integer pageSize); PageInfo<WxFinanceReceiveVo> receiveVoListAsPage(WxFinanceReceive record, Integer pageIndex, Integer pageSize);
PageInfo<WxFinanceReceiveBill> receiveBillListAsPage(WxFinanceReceiveBill record, Integer pageIndex, Integer pageSize); PageInfo<WxFinanceReceiveBill> receiveBillListAsPage(WxFinanceReceiveBill record, Integer pageIndex, Integer pageSize);
WxFinanceReceiveBillSum receiveBillSum(WxFinanceReceiveBill record);
void exportReceiveBill(WxFinanceReceiveBill record,HttpServletRequest request, HttpServletResponse response); void exportReceiveBill(WxFinanceReceiveBill record,HttpServletRequest request, HttpServletResponse response);
List<WxFinanceReceive> findReceiveList(WxFinanceReceive record); List<WxFinanceReceive> findReceiveList(WxFinanceReceive record);
Map createReceive(WxFinanceReceive record,MallUserInfo user); Map createReceive(WxFinanceReceive record,MallUserInfo user);


+ 7
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java Целия файл

@@ -32,6 +32,7 @@ import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.FinanceAdvanceBillVo; import com.iformall.domain.vo.FinanceAdvanceBillVo;
import com.iformall.domain.vo.FinanceBillSetoffSum; import com.iformall.domain.vo.FinanceBillSetoffSum;
import com.iformall.domain.vo.FinanceSetOffDetailVo; import com.iformall.domain.vo.FinanceSetOffDetailVo;
import com.iformall.domain.vo.WxFinanceReceiveBillSum;
import com.iformall.domain.vo.WxFinanceReceiveSumVo; import com.iformall.domain.vo.WxFinanceReceiveSumVo;
import com.iformall.domain.vo.WxFinanceReceiveVo; import com.iformall.domain.vo.WxFinanceReceiveVo;
import com.iformall.enums.EnumBillAllType; import com.iformall.enums.EnumBillAllType;
@@ -603,6 +604,12 @@ public class WxFinanceServiceImpl implements WxFinanceService {
return page; return page;
} }
@Override
public WxFinanceReceiveBillSum receiveBillSum(WxFinanceReceiveBill record) {
initReceiveBillQueryParam(record);
return wxFinanceReceiveBillMapper.findSum(record);
}
private void initReceiveBillQueryParam(WxFinanceReceiveBill record) { private void initReceiveBillQueryParam(WxFinanceReceiveBill record) {
if (StringUtils.isNotBlank(record.getMerchantName()) || StringUtils.isNotBlank(record.getShopNumber())) { if (StringUtils.isNotBlank(record.getMerchantName()) || StringUtils.isNotBlank(record.getShopNumber())) {
record.setMerchantName(StringContentUtils.unescapeHtml(record.getMerchantName())); record.setMerchantName(StringContentUtils.unescapeHtml(record.getMerchantName()));


+ 11
- 0
mallinkService/src/main/resources/mapper/WxFinanceReceiveBillMapper.xml Целия файл

@@ -100,6 +100,17 @@
<include refid="dynamicWhereConditions"/> <include refid="dynamicWhereConditions"/>
</select> </select>
<resultMap id="sumResultMap" type="com.iformall.domain.vo.WxFinanceReceiveBillSum">
<result column="receive" jdbcType="VARCHAR" property="receive"/>
<result column="pay" jdbcType="VARCHAR" property="pay" />
</resultMap>
<select id="findSum" parameterType="com.iformall.domain.po.WxFinanceReceiveBill" resultMap="sumResultMap">
select
sum(CAST(ifnull(receive,'0') AS DECIMAL(20,2))) receive ,
sum(CAST(ifnull(pay,'0') AS DECIMAL(20,2))) pay
from wx_finance_receive_bill
<include refid="dynamicWhereConditions"/>
</select>


</mapper> </mapper>



Зареждане…
Отказ
Запис