|
|
@@ -61,11 +61,13 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
private final String DEFAULT_PLATFORM_ID = "0";// 平台默认id
|
|
|
private final double DEFAULT_BROKERAGE_PROPORTION = 0; //佣金比例
|
|
|
private final double DEFAULT_COMMODITY_DISCOUNT = 1; //折扣比例
|
|
|
+ private final String DEFAULT_COMMODITY_MODE = "NO_MODE"; //暂无规格
|
|
|
@Override
|
|
|
- public OrderDetailBo selectCommodityDetail(String commodityId, Integer orderType) {
|
|
|
- OrderDetailBo bo = tOrderMapper.selectCommodityDetail(commodityId,orderType);
|
|
|
+ public OrderDetailBo selectCommodityDetail(String commodityId, Integer commodityType) {
|
|
|
+ OrderDetailBo bo = tOrderMapper.selectCommodityDetail(commodityId,commodityType);
|
|
|
bo.setOrderNo(String.valueOf(idGenerator.generateId()));
|
|
|
bo.setCreateTime(DateUtils.formatDate(new Date(),AFTConstants.YYYYMMDDHHMMSS));
|
|
|
+ bo.setCommodityType(commodityType);
|
|
|
if(StringUtils.isBlank(bo.getFirstPayment())) bo.setFirstPayment(String.valueOf(DEFAULT_FIRST_PAYMENT.doubleValue()));
|
|
|
return bo;
|
|
|
}
|
|
|
@@ -84,7 +86,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
tOrder.setCreateTime(DateUtils.parseDate(createTime, AFTConstants.YYYYMMDDHHMMSS));
|
|
|
tOrder.setBuyerId(TokenManager.getUserId());
|
|
|
tOrder.setSellerId(StringUtils.isBlank(bo.getSellerId()) ? DEFAULT_PLATFORM_ID : bo.getSellerId());
|
|
|
- tOrder.setCommodityMode(commodityMode);
|
|
|
+ tOrder.setCommodityMode(StringUtils.isBlank(commodityMode)?DEFAULT_COMMODITY_MODE: commodityMode);
|
|
|
tOrder.setCommodityType(commodityType);
|
|
|
tOrder.setCommodityQuantity(commodityQuantity);
|
|
|
tOrder.setBrokerageProportion(new BigDecimal(DEFAULT_BROKERAGE_PROPORTION));
|
|
|
@@ -485,7 +487,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
@Override
|
|
|
public OrderDetailBo selectOrderDetail(Long orderNo) {
|
|
|
TOrder t = tOrderMapper.selectByPrimaryKey(orderNo);
|
|
|
- OrderDetailBo bo = new OrderDetailBo();
|
|
|
+ OrderDetailBo bo = tOrderMapper.selectCommodityDetail(t.getCommodityId(),t.getCommodityType());
|
|
|
bo.setOrderNo(String.valueOf(t.getOrderNo()));
|
|
|
bo.setCommodityQuantity(t.getCommodityQuantity());
|
|
|
bo.setCommodityMode(t.getCommodityMode());
|
|
|
@@ -512,6 +514,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
for(FundingListBo bo:list){
|
|
|
odBo = tOrderMapper.selectCommodityDetail(bo.getCommodityId(),bo.getCommodityType());
|
|
|
bo.setCommodityName(odBo.getCommodityName());
|
|
|
+ bo.setBusinessDesc(setBusinessDesc(bo.getTransactionSubject(),bo.getTransactionAmount()));
|
|
|
}
|
|
|
}
|
|
|
return data;
|
|
|
@@ -546,4 +549,13 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
+ private String setBusinessDesc(Integer transactionSubject,BigDecimal transactionAmount){
|
|
|
+ String result = "";
|
|
|
+ if(transactionSubject == TransactionSubject.SUPPLY_PAY.getCode() || transactionSubject == TransactionSubject.REFUND.getCode()){
|
|
|
+ result = "收入-"+transactionAmount;
|
|
|
+ }else if(transactionSubject == TransactionSubject.SUPPLY_PAY.getCode()){
|
|
|
+ result = "支出-"+transactionAmount;
|
|
|
+ }
|
|
|
+ return result;
|
|
|
+ }
|
|
|
}
|