Browse Source

订单管理

wanghui 8 years ago
parent
commit
34aad8ae0d

+ 1 - 0
src/main/java/com/goafanti/common/mapper/TOrderMapper.xml

@@ -707,6 +707,7 @@
 		a.order_no as orderNo,
 		a.create_time as createTime,
 		a.transaction_subject as transactionSubject,
+		a.transaction_amount as transactionAmount,
 		b.commodity_type as commodityType
 	from
 		t_funding_records a left join t_order b on a.order_no = b.order_no

+ 10 - 0
src/main/java/com/goafanti/order/bo/FundingListBo.java

@@ -1,5 +1,7 @@
 package com.goafanti.order.bo;
 
+import java.math.BigDecimal;
+
 public class FundingListBo {
 	/** 订单编号 **/
 	private String orderNo;
@@ -13,6 +15,8 @@ public class FundingListBo {
 	private String createTime;
 	/** 交易科目 **/
 	private Integer transactionSubject;
+	/** 交易金额 **/
+	private BigDecimal transactionAmount;
 	/** 业务描述  收入 与 支出**/
 	private String businessDesc;
 	public String getOrderNo() {
@@ -51,6 +55,12 @@ public class FundingListBo {
 	public void setTransactionSubject(Integer transactionSubject) {
 		this.transactionSubject = transactionSubject;
 	}
+	public BigDecimal getTransactionAmount() {
+		return transactionAmount;
+	}
+	public void setTransactionAmount(BigDecimal transactionAmount) {
+		this.transactionAmount = transactionAmount;
+	}
 	public String getBusinessDesc() {
 		return businessDesc;
 	}

+ 1 - 1
src/main/java/com/goafanti/order/bo/OperatorActive.java

@@ -5,7 +5,7 @@ package com.goafanti.order.bo;
  *
  */
 public class OperatorActive {
-	/** 意向订单确认 **/
+	/** 确认意向订单 **/
 	private boolean confirmIntention;
 	/** 支付首付 **/
 	private boolean payForFirst; 

+ 5 - 10
src/main/java/com/goafanti/order/controller/OrderController.java

@@ -26,21 +26,21 @@ public class OrderController extends CertifyApiController{
 	/**
 	 * 进入添加意向订单
 	 * @param commodityId 商品编号
-	 * @param orderType 订单类型
+	 * @param commodityType 订单类型
 	 * @return
 	 */
 	@RequestMapping(value = "/toAddIntention" , method = RequestMethod.GET)
-	public Result toAddIntention(String commodityId,Integer orderType){
+	public Result toAddIntention(String commodityId,Integer commodityType){
 		Result res = new Result();
-		if(StringUtils.isBlank(commodityId) || null == orderType){
+		if(StringUtils.isBlank(commodityId) || null == commodityType){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"",""));
 			return res;
 		}
-		if(!CommodityType.containsType(orderType)){
+		if(!CommodityType.containsType(commodityType)){
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","订单类型错误"));
 			return res;
 		}
-		res.setData(orderServiceImpl.selectCommodityDetail(commodityId, orderType));
+		res.setData(orderServiceImpl.selectCommodityDetail(commodityId, commodityType));
 		return res;
 	}
 	
@@ -68,11 +68,6 @@ public class OrderController extends CertifyApiController{
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","商品id"));
 			return res;
 		}
-
-		if(StringUtils.isBlank(commodityMode)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","商品规格"));
-			return res;
-		}
 		if(StringUtils.isBlank(createTime)){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单时间"));
 			return res;

+ 16 - 4
src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

@@ -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;
+	}
 }