Browse Source

Merge remote-tracking branch 'origin/dev' into test

wanghui 8 years ago
parent
commit
360c8b072a

+ 1 - 0
src/main/java/com/goafanti/common/dao/TOrderBillMapper.java

@@ -2,6 +2,7 @@ package com.goafanti.common.dao;
 
 import com.goafanti.common.model.TOrderBill;
 import com.goafanti.common.model.TOrderBillExample;
+
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 

+ 8 - 0
src/main/java/com/goafanti/common/dao/TOrderMapper.java

@@ -4,6 +4,7 @@ import com.goafanti.common.model.TOrder;
 import com.goafanti.common.model.TOrderDetail;
 import com.goafanti.common.model.TOrderExample;
 import com.goafanti.order.bo.BillDetailBo;
+import com.goafanti.order.bo.BillListBo;
 import com.goafanti.order.bo.CommodityDetailBo;
 import com.goafanti.order.bo.ServiceOrderDetailBo;
 
@@ -125,4 +126,11 @@ public interface TOrderMapper {
 	 */
 	BillDetailBo selectBillDetail(String billNo);
 
+	/**
+	 * 查询单笔订单流水
+	 * @param orderNo
+	 * @return
+	 */
+	List<BillListBo> selectBillByOrderNo(String orderNo);
+
 }

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

@@ -1583,4 +1583,34 @@
 			${page_sql}
 		</if>
   </select>
+  
+  <select id="selectBillByOrderNo" parameterType="java.lang.String" resultType="com.goafanti.order.bo.BillListBo">
+  	select
+		a.bill_no as billNo,
+		date_format(a.create_time,'%Y-%m-%d %H:%i:%S') as createTime,
+		a.transaction_amount as transactionAmount,
+		a.transaction_channel as transactionChannel,
+		a.transaction_subject as transactionSubject,
+		a.transaction_mode as transactionMode,
+		a.financial_pay_no as financialPayNo,
+		date_format(a.financial_pay_time,'%Y-%m-%d %H:%i:%S') as financialPayTime,
+		a.confirm_sign as confirmSign,
+		a.delete_sign as deleteSign,
+		date_format(a.confirm_time,'%Y-%m-%d %H:%i:%S') as confirmTime,
+		b.order_no as orderNo,
+		c.nickname as payeeName,
+		d.nickname as payerName,
+		e.name as financeName,
+		f.name as salesmanName,
+		g.name as departmentName
+	from
+		t_order_bill a left join t_order b on
+		a.order_no = b.order_no left join user c on 
+		a.payee_id = c.id left join user d on
+		a.payer_id = d.id left join admin e on 
+		b.finance_id = e.id left join admin f on 
+		b.salesman_id = f.id left join department_management g on
+		f.department_id = g.id
+	where a.order_no = #{orderNo,jdbcType=VARCHAR}
+  </select>
 </mapper>

+ 16 - 0
src/main/java/com/goafanti/order/controller/AdminOrderApiController.java

@@ -554,4 +554,20 @@ public class AdminOrderApiController extends CertifyApiController {
 		orderServiceImpl.updateLockOrRevokeOrder(orderNo,operatorType);
 		return res;
 	}
+
+	/**
+	 * 查询单笔订单流水
+	 * @param orderNo
+	 * @return
+	 */
+	@RequestMapping(value= "/getBillByOrderNo", method = RequestMethod.GET)
+	public Result getBillByOrderNo(String orderNo){
+		Result res = new Result();
+		if(StringUtils.isBlank(orderNo)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
+			return res;
+		}
+		res.setData(orderServiceImpl.selectBillByOrderNo(orderNo));
+		return res;
+	}
 }

+ 7 - 0
src/main/java/com/goafanti/order/service/OrderService.java

@@ -399,4 +399,11 @@ public interface OrderService {
 	 * @return
 	 */
 	int updateLockOrRevokeOrder(String orderNo, Integer operatorType);
+
+	/**
+	 * 查询单笔订单流水
+	 * @param orderNo
+	 * @return
+	 */
+	List<BillListBo> selectBillByOrderNo(String orderNo);
 }

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

@@ -390,14 +390,12 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 					active.setConfirmIntention(false);
 					active.setRefuseIntention(false);
 				}
-				if (tOrder.getOrderStatus() == OrderState.WAIT_FOR_SIGN.getCode()
-						&& tOrder.getLiquidationStatus() == LiquidationState.WAIT_PAY_FIRST_BALANCE.getCode()) {
+				if (tOrder.getLiquidationStatus() == LiquidationState.WAIT_PAY_FIRST_BALANCE.getCode()) {
 					active.setPayForFirst(true); //支付首付
 				} else {
 					active.setPayForFirst(false); //支付首付
 				}
-				if (tOrder.getOrderStatus() == OrderState.WAIT_FOR_SIGN.getCode()
-						&& tOrder.getLiquidationStatus() == LiquidationState.WAIT_PAY_LAST_BALANCE.getCode()) {
+				if (tOrder.getLiquidationStatus() == LiquidationState.WAIT_PAY_LAST_BALANCE.getCode()) {
 					active.setPayForLast(true); //支付尾款
 				} else {
 					active.setPayForLast(false); //支付尾款
@@ -1503,4 +1501,10 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 			return DEFAULT_ADMIN_ID;
 		}
 	}
+
+	@Override
+	public List<BillListBo> selectBillByOrderNo(String orderNo) {
+		
+		return tOrderMapper.selectBillByOrderNo(orderNo);
+	}
 }

+ 2 - 2
src/main/java/com/goafanti/techproject/controller/AdminTechProjectApiController.java

@@ -830,9 +830,9 @@ public class AdminTechProjectApiController extends CertifyApiController {
 		if(task != null){
 			if(task.getTaskStatus() != TaskState.DISTRIBUTION.getCode());
 			res.getError().add(buildError(ErrorConstants.NOT_ACCORD_WITH_NEXT, ""));
+			task.setTaskStatus(TaskState.STARTED.getCode());
+			techProjectService.updateProjectTask(task);
 		}
-		task.setTaskStatus(TaskState.STARTED.getCode());
-		techProjectService.updateProjectTask(task);
 		return res;
 	}
 	

+ 1 - 1
src/main/webapp/WEB-INF/views/common.html

@@ -372,7 +372,7 @@
 				email : /*[[${adminData.email}]]*/'',
 				createTime : /*[[${adminData.createTime}]]*/'',
 				uid : /*[[${adminData.id}]]*/'',
-				isSuperAdmin : /*[[${shiro.hasRole('999999')}]]*/false
+				isSuperAdmin : /*[[${shiro.hasRole('999999')}]]*/false,
 				isApprovalDecision : /*[[${shiro.hasRole('99999')}]]*/false
 			}
 			window.showUserManage = /*[[${shiro.hasRole('999999') || shiro.isPermitted('admin/userManage')}]]*/false;