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

[结算管理][修改][显示账单金额]

release_toaliyun_real
gongbiao 6 лет назад
Родитель
Сommit
f80eeef588
5 измененных файлов: 16 добавлений и 8 удалений
  1. +0
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java
  3. +2
    -1
      mallinkService/src/main/java/com/iformall/service/WxBillAllService.java
  4. +11
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java
  5. +2
    -2
      mallinkService/src/main/resources/mapper/WxBillAllMapper.xml

+ 0
- 1
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java Просмотреть файл

@@ -20,7 +20,6 @@ import org.springframework.web.bind.annotation.*;


import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;




+ 1
- 1
mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java Просмотреть файл

@@ -51,6 +51,6 @@ public interface WxBillAllMapper {


Map<String, Object> getReceiveAndPayBillDetail(WxBillAll record); Map<String, Object> getReceiveAndPayBillDetail(WxBillAll record);


List<Map<String, Object>> allDepositList(WxBillAll wxBillAll);
List<WxBillAllVo> allDepositList(WxBillAll wxBillAll);


} }

+ 2
- 1
mallinkService/src/main/java/com/iformall/service/WxBillAllService.java Просмотреть файл

@@ -4,6 +4,7 @@ import com.iformall.common.ResultData;
import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.MallUserInfo;
import com.iformall.domain.po.WxBillSettle; import com.iformall.domain.po.WxBillSettle;
import com.iformall.domain.vo.WxBillAll; import com.iformall.domain.vo.WxBillAll;
import com.iformall.domain.vo.WxBillAllVo;
import com.iformall.domain.vo.WxBillExcelTemplate; import com.iformall.domain.vo.WxBillExcelTemplate;
import com.iformall.domain.vo.WxBillExcelTemplateOther; import com.iformall.domain.vo.WxBillExcelTemplateOther;
import com.iformall.enums.EnumBillAction; import com.iformall.enums.EnumBillAction;
@@ -18,7 +19,7 @@ import java.util.Map;
*/ */
public interface WxBillAllService { public interface WxBillAllService {


List<Map<String, Object>> allDepositList(WxBillAll wxBillAll);
List<WxBillAllVo> allDepositList(WxBillAll wxBillAll);


Map<String, Object> listAsPage(WxBillAll wxBillAll, Integer pageNum, Integer pageSize); Map<String, Object> listAsPage(WxBillAll wxBillAll, Integer pageNum, Integer pageSize);




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

@@ -159,7 +159,9 @@ public class WxBillAllServiceImpl implements WxBillAllService {


public void cmputeTotalMoney(WxPayAccountBill wxPayAccountBill, WxBillAllVo e) { public void cmputeTotalMoney(WxPayAccountBill wxPayAccountBill, WxBillAllVo e) {
if (e.getReceivePay() != null) { if (e.getReceivePay() != null) {
if (e.getLatePayPrice() == null) e.setLatePayPrice(0L);
if (e.getLatePayPrice() == null) {
e.setLatePayPrice(0L);
}
BigDecimal servicePay; BigDecimal servicePay;
if (e.getServiceChargePay() != null) { if (e.getServiceChargePay() != null) {
servicePay = new BigDecimal(e.getServiceChargePay()); servicePay = new BigDecimal(e.getServiceChargePay());
@@ -169,6 +171,7 @@ public class WxBillAllServiceImpl implements WxBillAllService {
Long realReceivePay = servicePay.longValue() + e.getLatePayPrice() + e.getReceivePay(); Long realReceivePay = servicePay.longValue() + e.getLatePayPrice() + e.getReceivePay();
e.setRealReceivePay(realReceivePay); e.setRealReceivePay(realReceivePay);
e.setServiceChargePay(servicePay.intValue()); e.setServiceChargePay(servicePay.intValue());
e.setOwe(realReceivePay - e.getPay());
} }
} }


@@ -1848,7 +1851,12 @@ public class WxBillAllServiceImpl implements WxBillAllService {
} }


@Override @Override
public List<Map<String, Object>> allDepositList(WxBillAll wxBillAll) {
return wxBillAllMapper.allDepositList(wxBillAll);
public List<WxBillAllVo> allDepositList(WxBillAll wxBillAll) {
WxPayAccountBill wxPayAccountBill = wxPayAccountBillService.getByTenantId(wxBillAll.getTenantId());
List<WxBillAllVo> wxBillAllVos = wxBillAllMapper.allDepositList(wxBillAll);
wxBillAllVos.stream().forEach(e -> {
cmputeTotalMoney(wxPayAccountBill, e);
});
return wxBillAllVos;
} }
} }

+ 2
- 2
mallinkService/src/main/resources/mapper/WxBillAllMapper.xml Просмотреть файл

@@ -858,8 +858,8 @@
limit #{limitStart},#{limitEnd} limit #{limitStart},#{limitEnd}
</if> </if>
</select> </select>
<select id="allDepositList" parameterType="com.iformall.domain.vo.WxBillAll" resultType="hashmap">
<select id="allDepositList" parameterType="com.iformall.domain.vo.WxBillAll" resultMap="allVoResultMap">
select bill.* select bill.*
from ( from (
select id,merchant_id,shop_id,tenant_id,'租赁押金' name,2 bill_type_value,'租赁押金' select id,merchant_id,shop_id,tenant_id,'租赁押金' name,2 bill_type_value,'租赁押金'


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