Browse Source

订单流程更新

anderx 6 years ago
parent
commit
e3de814639

+ 4 - 0
src/main/java/com/goafanti/common/dao/TOrderLogMapper.java

@@ -2,6 +2,8 @@ package com.goafanti.common.dao;
 
 import com.goafanti.common.model.TOrderLog;
 import com.goafanti.common.model.TOrderLogExample;
+import com.goafanti.order.bo.TOrderLogBo;
+
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
@@ -72,4 +74,6 @@ public interface TOrderLogMapper {
 	 * @mbg.generated  Fri Apr 12 15:30:47 CST 2019
 	 */
 	int updateByPrimaryKey(TOrderLog record);
+
+	List<TOrderLogBo> selectOrderByNo(String orderNo);
 }

+ 2 - 2
src/main/java/com/goafanti/common/mapper/TOrderBillNewMapper.xml

@@ -477,10 +477,10 @@
   <!-- 查看自己创建的流水数据 -->
   <select id="myBillList" parameterType="Map" resultType="com.goafanti.common.model.TOrderBillNew">
   select 
-  	b.bill_no as billNo, b.order_no as orderNo, b.transaction_amount as transactionAmount,
+  	b.bill_no as billNo, b.order_no as orderNo, b.transaction_amount as transactionAmount,a.create_time as createTime,
   	b.payer_id as payerId, b.payee_id as payeeId, u.nickname as payerName, a.nickname as payeeName, 
   	b.transaction_subject as transactionSubject, b.transaction_channel as transactionChannel, 
-  	b.financial_pay_time as financialPayTimes,b.financial_pay_no as financialPayNo,
+  	b.financial_pay_time as financialPayTime,b.financial_pay_no as financialPayNo,
   	b.creater, ad.name as createrName, o.salesman_id as saleId, oa.name as saleName
   	from t_order_bill_new b
   	left join `user` u on b.payer_id = u.id

+ 6 - 0
src/main/java/com/goafanti/common/mapper/TOrderLogMapper.xml

@@ -283,4 +283,10 @@
       aid = #{aid,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
+  <select id="selectOrderByNo" 	parameterType="string"	resultType="com.goafanti.order.bo.TOrderLogBo">
+  select a.id,a.order_no as orderNo,a.process,a.create_time as createTime, b.name as adminName
+	from t_order_log a left join admin b on a.aid=b.id
+	where a.order_no= #{orderNo,jdbcType=VARCHAR}
+	order by a.create_time
+  </select>
 </mapper>

+ 17 - 1
src/main/java/com/goafanti/common/model/TOrderBillNew.java

@@ -3,6 +3,10 @@ package com.goafanti.common.model;
 import java.math.BigDecimal;
 import java.util.Date;
 
+import org.apache.commons.lang3.time.DateFormatUtils;
+
+import com.goafanti.common.constant.AFTConstants;
+
 public class TOrderBillNew {
     /**
      *
@@ -149,7 +153,7 @@ public class TOrderBillNew {
     private String saleId;
     private String saleName;
     private String departmentName;
-    
+    private String createTimes;
     
     /**
      * This method was generated by MyBatis Generator.
@@ -590,4 +594,16 @@ public class TOrderBillNew {
 	public void setDepartmentName(String departmentName) {
 		this.departmentName = departmentName;
 	}
+
+	public String getCreateTimes() {
+		if (this.createTime == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(this.getCreateTime(), AFTConstants.YYYYMMDDHHMMSS);
+		}
+	}
+
+	public void setCreateTimes(String createTimes) {
+		this.createTimes = createTimes;
+	}
 }

+ 75 - 0
src/main/java/com/goafanti/order/bo/TOrderLogBo.java

@@ -0,0 +1,75 @@
+package com.goafanti.order.bo;
+
+import org.apache.commons.lang3.time.DateFormatUtils;
+
+import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.model.TOrderLog;
+
+//@SuppressWarnings("unused")
+public class TOrderLogBo extends TOrderLog{
+	private String processName;
+	private String adminName;
+	private String createDate;
+	
+	
+
+	public String getProcessName() {
+		switch (super.getProcess()) {
+		case 1:
+			return "提交";
+		case 2:
+			return "审核";
+		case 3:
+			return "驳回";
+		case 4:
+			return "特批";
+		case 5:
+			return "财务派单";
+		case 6:
+			return "财务首付";
+		case 7:
+			return "订单派单";
+		case 8:
+			return "项目派单";
+		case 9:
+			return "项目完成";
+		case 0:
+			return "发起退单";
+		case 10:
+		return "退单完成";
+		case 11:
+			return "财务全款";
+		default:
+			return "未知";
+		}
+	}
+
+	public void setProcessName(String processName) {
+		this.processName = processName;
+	}
+
+	public String getAdminName() {
+		return adminName;
+	}
+
+	public void setAdminName(String adminName) {
+		this.adminName = adminName;
+	}
+
+	public String getCreateDate() {
+		if (super.getCreateTime() == null) {
+			return null;
+		} else {
+			return DateFormatUtils.format(super.getCreateTime(), AFTConstants.YYYYMMDDHHMMSS);
+		}
+	}
+
+	public void setCreateDate(String createDate) {
+		this.createDate = createDate;
+	}
+
+	
+	
+	
+		
+}

+ 13 - 0
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -435,6 +435,19 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		orderNewService.updateFinance( orderNo, newFinance);
 		return res;
 	}
+	/**
+	 * 查看订单日志
+	 */
+	@RequestMapping(value ="/selectOrderLog", method=RequestMethod.GET)
+	public Result selectOrderLog (String orderNo) {
+		Result res=new Result();
+		if (StringUtils.isBlank(orderNo)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "订单编号","订单编号"));
+			return res;
+		}
+		res.data(orderNewService.selectOrderLog(orderNo));
+		return res;
+	}
 	
 	/** 退单文件上传 **/
 	@RequestMapping(value = "/uploadRefundOrderFile", method = RequestMethod.POST)

+ 2 - 2
src/main/java/com/goafanti/order/controller/FundManagerOrderApiController.java

@@ -142,7 +142,7 @@ public class FundManagerOrderApiController extends CertifyApiController {
 		//流水时间处理
 		//if(StringUtils.isNotEmpty(billNew.getFinancialPayTimes())){
 			try {
-				billNew.setFinancialPayTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(billNew.getFinancialPayTimes()));
+				billNew.setFinancialPayTime(new SimpleDateFormat("yyyy-MM-dd").parse(billNew.getFinancialPayTimes()));
 			} catch (ParseException e) {
 				e.printStackTrace();
 				res.getError().add(buildError("", "财务流水时间有误!"));
@@ -215,7 +215,7 @@ public class FundManagerOrderApiController extends CertifyApiController {
 		}
 		//if(StringUtils.isNotEmpty(orderRefund.getFinancialPayTimes())){
 			try {
-			orderRefund.setFinancialPayTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(orderRefund.getFinancialPayTimes()));
+			orderRefund.setFinancialPayTime(new SimpleDateFormat("yyyy-MM-dd").parse(orderRefund.getFinancialPayTimes()));
 			} catch (ParseException e) {
 				e.printStackTrace();
 				res.getError().add(buildError("", "财务流水时间有误!"));

+ 3 - 0
src/main/java/com/goafanti/order/service/OrderNewService.java

@@ -8,6 +8,7 @@ import javax.mail.MessagingException;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
 import com.goafanti.common.model.TOrderDun;
+import com.goafanti.common.model.TOrderLog;
 import com.goafanti.common.model.TOrderNew;
 import com.goafanti.common.model.TOrderRefundWithBLOBs;
 import com.goafanti.common.model.TOrderTask;
@@ -18,6 +19,7 @@ import com.goafanti.order.bo.OrderDunTaskBo;
 import com.goafanti.order.bo.OrderRefundBo;
 import com.goafanti.order.bo.OrderRefundDetailBo;
 import com.goafanti.order.bo.TDunLogListBo;
+import com.goafanti.order.bo.TOrderLogBo;
 import com.goafanti.order.bo.TOrderNewBo;
 import com.goafanti.order.bo.TOrderRefundBo;
 import com.goafanti.order.bo.TOrderTaskBo;
@@ -166,6 +168,7 @@ public interface OrderNewService {
 	boolean checkORderDun(String orderNo);
 	
 	int updateFinance(String orderNo, String newFinance);
+	List<TOrderLogBo> selectOrderLog(String orderNo);
 	
 	
 }

+ 8 - 0
src/main/java/com/goafanti/order/service/impl/OrderBillServiceImpl.java

@@ -4,11 +4,13 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.lang3.time.DateFormatUtils;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.TOrderBillNewMapper;
 import com.goafanti.common.model.TOrderBillNew;
 import com.goafanti.common.utils.ExportExcelUtil;
@@ -33,6 +35,12 @@ public class OrderBillServiceImpl extends BaseMybatisDao<TOrderBillNewMapper> im
 		Map<String, Object> params = new HashMap<String, Object>();
 		params.put("b", billNew);
 		Pagination<TOrderBillNew> data = (Pagination<TOrderBillNew>)findPage("myBillList", "myBillCount", params, pageNo, pageSize);
+		List<TOrderBillNew> l=(List<TOrderBillNew>) data.getList();
+		for (TOrderBillNew t : l) {
+			if (t.getFinancialPayTime()!=null) {
+				t.setFinancialPayTimes(DateFormatUtils.format(t.getFinancialPayTime(), AFTConstants.YYYYMMDD));
+			}
+		}
 		return data;
 	}
 

+ 8 - 0
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -64,6 +64,7 @@ import com.goafanti.customer.bo.LockingReleaseBo;
 import com.goafanti.order.bo.OrderDunTaskBo;
 import com.goafanti.order.bo.OrderRefundDetailBo;
 import com.goafanti.order.bo.TDunLogListBo;
+import com.goafanti.order.bo.TOrderLogBo;
 import com.goafanti.order.bo.TOrderNewBo;
 import com.goafanti.order.bo.TOrderRefundBo;
 import com.goafanti.order.bo.TOrderTaskBo;
@@ -700,5 +701,12 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		return tOrderNewMapper.updateFinance(aid,orderNo,newFinance);
 		
 	}
+
+
+
+	@Override
+	public List<TOrderLogBo> selectOrderLog(String orderNo) {
+		return tOrderLogMapper.selectOrderByNo(orderNo);
+	}
 	
 }