mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-20 11:05:18 +08:00
update 新分账方法
This commit is contained in:
@@ -17,7 +17,6 @@ import com.huifu.adapay.model.Payment;
|
||||
import com.huifu.adapay.model.PaymentReverse;
|
||||
import com.huifu.adapay.model.Refund;
|
||||
import com.jsowell.JsowellApplication;
|
||||
import com.jsowell.adapay.common.DivMember;
|
||||
import com.jsowell.adapay.common.PaymentConfirmInfo;
|
||||
import com.jsowell.adapay.config.AbstractAdapayConfig;
|
||||
import com.jsowell.adapay.dto.*;
|
||||
@@ -110,7 +109,7 @@ import java.text.SimpleDateFormat;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@ActiveProfiles("pre")
|
||||
@ActiveProfiles("dev")
|
||||
@SpringBootTest(classes = JsowellApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
|
||||
@RunWith(SpringRunner.class)
|
||||
public class SpringBootTestController {
|
||||
@@ -3951,10 +3950,10 @@ public class SpringBootTestController {
|
||||
afterSettleOrderDTO.setOrderElectricityDiscountAmount(new BigDecimal("6")); // 电费优惠金额
|
||||
afterSettleOrderDTO.setOrderServiceAmount(new BigDecimal("10")); // 服务费金额
|
||||
afterSettleOrderDTO.setOrderServiceDiscountAmount(new BigDecimal("2")); // 服务费优惠金额
|
||||
afterSettleOrderDTO.setOrderRefundAmount(new BigDecimal("21")); // 退款金额
|
||||
afterSettleOrderDTO.setOrderRefundAmount(new BigDecimal("20")); // 退款金额
|
||||
|
||||
List<StationSplitConfig> stationSplitConfigList = stationSplitConfigService.queryByStationId(afterSettleOrderDTO.getStationId());
|
||||
List<DivMember> divMemberList = orderBasicInfoService.calculationOfSplitAmount(stationSplitConfigList, afterSettleOrderDTO, null);
|
||||
List<SplitData> divMemberList = orderBasicInfoService.calculationSplitDataList(stationSplitConfigList, afterSettleOrderDTO);
|
||||
System.out.println(JSON.toJSONString(divMemberList));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user