|
|
@@ -69,8 +69,15 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
bo.setOrderNo(String.valueOf(idGenerator.generateId()));
|
|
|
bo.setCreateTime(DateUtils.formatDate(new Date(),AFTConstants.YYYYMMDDHHMMSS));
|
|
|
bo.setCommodityType(commodityType);
|
|
|
+ if(bo.getCommodityPrice().equals("0")){
|
|
|
+ bo.setCommodityPrice("面议");
|
|
|
+ }else{
|
|
|
+ bo.setCommodityPrice(bo.getCommodityPrice()+" 万");
|
|
|
+ }
|
|
|
if(StringUtils.isBlank(bo.getFirstPayment()))
|
|
|
- bo.setFirstPayment(String.valueOf(DEFAULT_FIRST_PAYMENT.doubleValue()));
|
|
|
+ bo.setFirstPayment("面议");
|
|
|
+ else
|
|
|
+ bo.setFirstPayment(bo.getFirstPayment()+" 万");
|
|
|
return bo;
|
|
|
}
|
|
|
|
|
|
@@ -537,14 +544,14 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
bo.setCommodityQuantity(t.getCommodityQuantity());
|
|
|
bo.setCommodityMode(t.getCommodityMode());
|
|
|
bo.setCommodityId(t.getCommodityId());
|
|
|
- bo.setCommodityPrice(String.valueOf(t.getCommodityPrice()));
|
|
|
+ bo.setCommodityPrice(String.valueOf(t.getCommodityPrice()).equals("0")?"面议":String.valueOf(t.getCommodityPrice())+" 万");
|
|
|
+ bo.setCommodityType(t.getCommodityType());
|
|
|
bo.setOrderRemarks(t.getOrderRemarks());
|
|
|
bo.setCreateTime(DateUtils.formatDate(t.getCreateTime(),AFTConstants.YYYYMMDDHHMMSS));
|
|
|
bo.setOrderStatus(OrderState.getStatus(t.getOrderStatus()).getDesc());
|
|
|
- bo.setCommodityType(t.getCommodityType());
|
|
|
- bo.setOrderAmount(String.valueOf(t.getOrderAmount()));
|
|
|
+ bo.setOrderAmount(String.valueOf(t.getOrderAmount()).equals("0")?"面议":String.valueOf(t.getOrderAmount())+" 万");
|
|
|
+ bo.setFirstPayment(String.valueOf(t.getFirstPayment()).equals("0")?"面议":String.valueOf(t.getFirstPayment())+" 万");
|
|
|
bo.setOperatorActive(setOperatorActive(t));
|
|
|
- bo.setFirstPayment(String.valueOf(t.getFirstPayment()));
|
|
|
return bo;
|
|
|
}
|
|
|
|
|
|
@@ -607,7 +614,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
*/
|
|
|
private String setBusinessDesc(Integer transactionSubject,BigDecimal transactionAmount){
|
|
|
String result = "";
|
|
|
- if(transactionSubject == TransactionSubject.SUPPLY_PAY.getCode() || transactionSubject == TransactionSubject.REFUND.getCode()){
|
|
|
+ if(transactionSubject == TransactionSubject.SUPPLY_COLLECT.getCode() || transactionSubject == TransactionSubject.REFUND.getCode()){
|
|
|
result = "收入-"+transactionAmount;
|
|
|
}else if(transactionSubject == TransactionSubject.SUPPLY_PAY.getCode()){
|
|
|
result = "支出-"+transactionAmount;
|