|
|
@@ -3,6 +3,9 @@ package com.iformall.service.test; |
|
|
import com.alibaba.fastjson.JSON; |
|
|
import com.alibaba.fastjson.JSON; |
|
|
import com.iformall.domain.po.*; |
|
|
import com.iformall.domain.po.*; |
|
|
import com.iformall.domain.vo.WxBillAll; |
|
|
import com.iformall.domain.vo.WxBillAll; |
|
|
|
|
|
import com.iformall.enums.EnumSettleRecordWay; |
|
|
|
|
|
import com.iformall.enums.EnumSettleStatus; |
|
|
|
|
|
import com.iformall.mapper.WxBillSettleMapper; |
|
|
import com.iformall.service.*; |
|
|
import com.iformall.service.*; |
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
import org.apache.shiro.SecurityUtils; |
|
|
import org.apache.shiro.SecurityUtils; |
|
|
@@ -27,6 +30,8 @@ import org.springframework.test.web.servlet.setup.MockMvcBuilders; |
|
|
import org.springframework.web.context.WebApplicationContext; |
|
|
import org.springframework.web.context.WebApplicationContext; |
|
|
|
|
|
|
|
|
import javax.annotation.Resource; |
|
|
import javax.annotation.Resource; |
|
|
|
|
|
import java.math.BigDecimal; |
|
|
|
|
|
import java.util.Date; |
|
|
|
|
|
|
|
|
@Slf4j |
|
|
@Slf4j |
|
|
@AutoConfigureMockMvc |
|
|
@AutoConfigureMockMvc |
|
|
@@ -61,6 +66,10 @@ public class Test { |
|
|
private WxBillSettleService wxBillSettleService; |
|
|
private WxBillSettleService wxBillSettleService; |
|
|
@Autowired |
|
|
@Autowired |
|
|
private WxBillAllService wxBillAllService; |
|
|
private WxBillAllService wxBillAllService; |
|
|
|
|
|
@Autowired |
|
|
|
|
|
private WxBillSettleMapper wxBillSettleMapper; |
|
|
|
|
|
@Autowired |
|
|
|
|
|
private WxBillSettleRecordService wxBillSettleRecordService; |
|
|
|
|
|
|
|
|
@Before |
|
|
@Before |
|
|
public void setUp() { |
|
|
public void setUp() { |
|
|
@@ -87,11 +96,29 @@ public class Test { |
|
|
public void levelList() { |
|
|
public void levelList() { |
|
|
// WxBillSettle settle = wxBillSettleService.getById(328411851323572224l); |
|
|
// WxBillSettle settle = wxBillSettleService.getById(328411851323572224l); |
|
|
// log.debug("data:{}", JSON.toJSONString(settle)); |
|
|
// log.debug("data:{}", JSON.toJSONString(settle)); |
|
|
WxBillAll wxBillAll = new WxBillAll(); |
|
|
|
|
|
wxBillAll.setMerchantId(324754110547066880l); |
|
|
|
|
|
wxBillAll.setTenantId("456"); |
|
|
|
|
|
wxBillAll.setBillTypeValue(10); |
|
|
|
|
|
log.debug("data:{}", JSON.toJSONString( wxBillAllService.listBill(wxBillAll))); |
|
|
|
|
|
|
|
|
// WxBillAll wxBillAll = new WxBillAll(); |
|
|
|
|
|
// wxBillAll.setMerchantId(324754110547066880l); |
|
|
|
|
|
// wxBillAll.setTenantId("456"); |
|
|
|
|
|
// wxBillAll.setBillTypeValue(10); |
|
|
|
|
|
// log.debug("data:{}", JSON.toJSONString( wxBillAllService.listBill(wxBillAll))); |
|
|
|
|
|
|
|
|
|
|
|
WxBillSettle wxBillSettle = wxBillSettleService.getById(330875180045271040l); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
WxBillSettleRecord settleRecord = new WxBillSettleRecord(); |
|
|
|
|
|
settleRecord.setSettleId(wxBillSettle.getId()); |
|
|
|
|
|
settleRecord.setSettleMoney(wxBillSettle.getBalance()); |
|
|
|
|
|
settleRecord.setSettleTime(new Date()); |
|
|
|
|
|
settleRecord.setSettleWay(EnumSettleRecordWay.WEBCAT.getCode()); |
|
|
|
|
|
settleRecord.setTenantId(wxBillSettle.getTenantId()); |
|
|
|
|
|
|
|
|
|
|
|
BigDecimal money = new BigDecimal(settleRecord.getSettleMoney()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP); |
|
|
|
|
|
settleRecord.setDetail(EnumSettleRecordWay.getEnum(settleRecord.getSettleWay()).getMessage()+"收款"+money.toString()+"元"); |
|
|
|
|
|
wxBillSettleRecordService.saveOrUpdate(settleRecord,null,wxBillSettle.getId()); |
|
|
|
|
|
|
|
|
|
|
|
wxBillSettle.setUpdatetime(new Date()); |
|
|
|
|
|
wxBillSettle.setStatus(EnumSettleStatus.FINISH.getCode()); |
|
|
|
|
|
wxBillSettleMapper.updateByPrimaryKeySelective(wxBillSettle); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|