Browse Source

Merge branch 'test' of http://git.jishutao.com/jishutao/kede-server.git
into test

Conflicts:
src/main/java/com/goafanti/common/mapper/AdminMapper.xml
src/main/java/com/goafanti/order/bo/TOrderNewBo.java

limin 7 years ago
parent
commit
9f748a74a7

+ 13 - 1
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -3069,7 +3069,19 @@ public class AdminApiController extends CertifyApiController {
 		return res;
 	}
 	
-	
+	/**
+	 * 角色列表
+	 */
+	@RequestMapping(value = "/getAdminRoleList", method = RequestMethod.GET)
+	public Result getAdminRoleList(String roleName){
+		Result res = new Result();
+		if( StringUtils.isBlank(roleName)){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "角色名称必须指定"));
+			return res;
+		}
+		res.setData(adminService.getAdminRoleList( roleName));
+		return res;
+	}
 
 	/**
 	 * 锁定密码未更改的用户

+ 2 - 0
src/main/java/com/goafanti/admin/service/AdminService.java

@@ -68,4 +68,6 @@ public interface AdminService {
 	int updateLockAdmin();
 
 	List<Admin> getListDefaultPassword(String id);
+
+	List<Admin> getAdminRoleList(String roleName);
 }

+ 6 - 0
src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java

@@ -319,6 +319,12 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 		return list2;
 	}
 
+	@Override
+	public List<Admin> getAdminRoleList(String roleName) {
+		
+		return adminMapper.getAdminRoleList(roleName);
+	}
+
 	
 
 }

+ 3 - 1
src/main/java/com/goafanti/common/dao/AdminMapper.java

@@ -178,4 +178,6 @@ public interface AdminMapper {
 	int getCountById(String id);
 	AdminListBo getDeptNameByAid(String id);
 
-}
+	List<Admin> getAdminRoleList(String roleName);
+
+}

+ 5 - 0
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -960,6 +960,11 @@
    	inner join user_role ur on a.id=ur.uid
    	where a.id= #{_parameter,jdbcType=VARCHAR} and ( a.status != '注销' or a.status is null)
   </select>
+  <select id="getAdminRoleList" parameterType="java.lang.String" resultMap="BaseResultMap">
+		select a.id, a.name from admin a left join user_role b on a.id=b.uid
+	left join `role` c on b.rid=c.id
+	where c.role_name  = #{name,jdbcType=VARCHAR}
+  </select>
   <!-- 获得当前登录人的名字和部门名 -->
   <select id="getDeptNameByAid" parameterType="java.lang.String" resultType="com.goafanti.admin.bo.AdminListBo">
   	select a.name, d.name as departmentName from admin a

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

@@ -366,6 +366,6 @@
     where id = #{id,jdbcType=VARCHAR}
   </update>
   <select id="selectByOrderNoDunSubject" resultType="com.goafanti.common.model.TOrderDun">
-  	select id,dun_subject as dunSubject,money from t_order_dun where order_no= #{orderNo,jdbcType=VARCHAR}
+  	select id,dun_subject as dunSubject,money,order_no as orderNo from t_order_dun where order_no= #{orderNo,jdbcType=VARCHAR}
   </select>
 </mapper>

+ 66 - 10
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1011,12 +1011,19 @@
   		a.order_no as orderNo,a.create_time as createTime, date_format(a.sign_time,'%Y-%m-%d' ) as signDate,
   		b.nickname as userName ,a.process_status as processStatus,a.total_amount as totalAmount,
   		a.liquidation_status as liquidationStatus,a.approval,c.name as salesmanName,d.name as financeName
+  	<if test="specially == 4">
+  	,f.name as consultantName
+  	</if>
   	from t_order_new a  left join `user` b on a.buyer_id=b.id 
   	left join admin c on a.salesman_id=c.id
   	left join admin d on a.finance_id=d.id
+  	<if test="specially == 4">
+  	left join (select * from t_order_task where main=1) e on e.order_no=a.order_no
+  	left join admin f on e.task_receiver=f.id
+  	</if>
   	where a.delete_sign = 0 
   	<if test="specially == 0">
-  	and a.order_status not in(3,5) and a.approval !=3
+  	and a.order_status not in(3,5,6) and a.approval !=3
   	</if>
   	<if test="specially == 1">
   	and a.process_status =1  and a.order_status=1
@@ -1027,6 +1034,16 @@
   	<if test="specially == 3">
   	and a.approval = 1 and  a.order_status=2
   	</if>
+  	<if test="specially == 4">
+  	and a.process_status in (4,5,6)
+  	</if>
+  	<if test="distribution == 1">
+  	and a.process_status = 5
+  	</if>
+  	<if test="distribution == 2">
+  	and a.process_status = 6
+  	</if>
+  	
   	<if test="aid != null">
   	and a.salesman_id = #{aid,jdbcType=VARCHAR}
   	</if>
@@ -1037,8 +1054,7 @@
   	and a.order_no = #{orderNo,jdbcType=VARCHAR}
   	</if>
   	<if test="starTime !=null and endTime !=null">
-  	and a.sign_time &gt; #{starTime,jdbcType=VARCHAR} 
-  	and a.sign_time &lt; #{endTime,jdbcType=VARCHAR}
+  	and a.sign_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
   	</if>
   	order by a.sign_time desc
   	<if test="page_sql!=null">
@@ -1063,6 +1079,9 @@
   	<if test="specially == 3">
   	and a.approval = 1 and  a.order_status=2
   	</if>
+	<if test="specially == 4">
+  	and a.process_status in (4,5,6)
+  	</if>
   	<if test="aid != null">
   	and a.salesman_id = #{aid,jdbcType=VARCHAR}
   	</if>
@@ -1073,7 +1092,7 @@
   	and a.order_no = #{orderNo,jdbcType=VARCHAR}
   	</if>
   	<if test="starTime !=null and endTime !=null">
-  	and #{starTime,jdbcType=VARCHAR} &lt; a.sign_time &lt; #{endTime,jdbcType=VARCHAR}
+  	and a.sign_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
   	</if>
   </select>
   
@@ -1094,8 +1113,7 @@
   	and a.order_no = #{orderNo,jdbcType=VARCHAR}
   	</if>
   	<if test="starTime !=null and endTime !=null">
-  	and b.sign_time &gt; #{starTime,jdbcType=VARCHAR} 
-  	and b.sign_time &lt; #{endTime,jdbcType=VARCHAR}
+  	and b.sign_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
   	</if>
   	order by b.sign_time desc
   	<if test="page_sql!=null">
@@ -1116,8 +1134,7 @@
   	and a.order_no = #{orderNo,jdbcType=VARCHAR}
   	</if>
   	<if test="starTime !=null and endTime !=null">
-  	and b.sign_time &gt; #{starTime,jdbcType=VARCHAR} 
-  	and b.sign_time &lt; #{endTime,jdbcType=VARCHAR}
+	and b.sign_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
   	</if>
   </select>
   
@@ -1129,13 +1146,52 @@
     a.sign_time as signTime, a.settlement_time as settlementTime, a.contract_no as contractNo, a.contract_type as contractType, a.contacts, a.contact_mobile as contactMobile, 
     a.legal_person as legalPerson, a.legal_person_tel as legalPersonTel, a.proof_count as proofCount, a.proof_aid as proofAid,contract_picture_url as contractPictureUrl,
     c.name as salesmanName,d.name as financeName,c.contact_mobile as salesmanMobile,d.contact_mobile as financeMobile,b.nickname as userName
-    ,e.back_status as backStatus,f.name as initiateName,e.reason,date_format(e.create_time,'%Y-%m-%d') as backDate
+    ,e.back_status as backStatus,f.name as initiateName,e.reason,date_format(e.create_time,'%Y-%m-%d') as backDate,a.buyer_id as uid
     from t_order_new a
     left join `user` b on a.buyer_id=b.id
     left join admin c on a.salesman_id=c.id
   	left join admin d on a.finance_id=d.id
-  	left join t_order_back e on a.order_no=e.order_no
+  	left join (select * from t_order_back a where back_status=0) e on a.order_no=e.order_no
   	left join admin f on e.initiate=f.id
     where a.order_no = #{orderNo,jdbcType=VARCHAR}
   </select>
+  
+   <select id="selectOrderRefundListByPage" resultType="com.goafanti.order.bo.TOrderRefundBo">
+  	select a.id, date_format(a.create_time,'%Y-%m_%d') as createDate,a.order_no as orderNo,
+    c.nickname as userName,b.order_status as orderStatus,a.refund_status as refundStatus,
+    a.reason,b.liquidation_status as liquidationStatus
+    from t_order_refund a left join t_order_new b on a.order_no=b.order_no
+    left join `user` c on b.buyer_id=c.id 
+    where  b.delete_sign = 0 and b.order_status = 6
+    <if test="name != null">
+  	and c.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
+  	</if>
+  	<if test="orderNo != null">
+  	and a.order_no = #{orderNo,jdbcType=VARCHAR}
+  	</if>
+  	<if test="starTime !=null and endTime !=null">
+  	and a.create_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
+  	</if>
+  	order by a.create_time desc
+  	<if test="page_sql!=null">
+			${page_sql}
+	</if>
+  </select>
+  
+   <select id="selectOrderRefundListCount" resultType="java.lang.Integer">
+  	select 
+		count(*)
+  	 from t_order_refund a left join t_order_new b on a.order_no=b.order_no
+    left join `user` c on b.buyer_id=c.id 
+    where  b.delete_sign = 0 and b.order_status = 6
+    <if test="name != null">
+  	and c.nickname like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
+  	</if>
+  	<if test="orderNo != null">
+  	and a.order_no = #{orderNo,jdbcType=VARCHAR}
+  	</if>
+  	<if test="starTime !=null and endTime !=null">
+  	and a.create_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
+  	</if>
+  </select>
 </mapper>

+ 1 - 1
src/main/java/com/goafanti/common/utils/FileUtils.java

@@ -106,7 +106,7 @@ public class FileUtils {
 				|| sign.indexOf("achievement_technical_picture") != -1
 				|| sign.indexOf("achievement_maturity_picture") != -1 || sign.indexOf("demand_order_file") != -1
 				|| sign.indexOf("lecture_picture") != -1|| sign.indexOf("cover_picture") != -1 
-				|| sign.indexOf("news") != -1||sign.indexOf("customer_sys_file") != -1
+				|| sign.indexOf("news") != -1||sign.indexOf("customer_sys_file") != -1 || sign.indexOf("order_refund_file") != -1
 				||sign.indexOf("business_project_max_picture") != -1||sign.indexOf("business_project_min_picture") != -1
 				||sign.indexOf("varieties_picture") != -1  || sign.indexOf("organization_application") != -1) {
 			uniq = true;

+ 17 - 0
src/main/java/com/goafanti/order/bo/TOrderNewBo.java

@@ -12,6 +12,7 @@ public class TOrderNewBo extends TOrderNew{
 	private String userName;
 	private String salesmanName;
 	private String financeName;
+	private String consultantName;
 	private String dunSubject;
 	private String startDate;
 	private String financeMobile;
@@ -20,6 +21,7 @@ public class TOrderNewBo extends TOrderNew{
 	private String initiateName;
 	private String reason;
 	private String backDate;
+	private String uid;
 	private String email;
 	
 	public String getSignDate() {
@@ -152,5 +154,20 @@ public class TOrderNewBo extends TOrderNew{
 	public void setEmail(String email) {
 		this.email = email;
 	}
+	public String getUid() {
+		return uid;
+	}
+
+	public void setUid(String uid) {
+		this.uid = uid;
+	}
+
+	public String getConsultantName() {
+		return consultantName;
+	}
+
+	public void setConsultantName(String consultantName) {
+		this.consultantName = consultantName;
+	}
 	
 }

+ 61 - 0
src/main/java/com/goafanti/order/bo/TOrderRefundBo.java

@@ -0,0 +1,61 @@
+package com.goafanti.order.bo;
+
+public class TOrderRefundBo {
+	private String 	id;
+	private String createDate;
+	private String orderNo;
+	private String userName;
+	private String orderStatus;
+	private String refundStatus;
+	private String reason;
+	private String liquidationStatus;
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public String getCreateDate() {
+		return createDate;
+	}
+	public void setCreateDate(String createDate) {
+		this.createDate = createDate;
+	}
+	public String getOrderNo() {
+		return orderNo;
+	}
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+	public String getUserName() {
+		return userName;
+	}
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+	public String getOrderStatus() {
+		return orderStatus;
+	}
+	public void setOrderStatus(String orderStatus) {
+		this.orderStatus = orderStatus;
+	}
+	public String getRefundStatus() {
+		return refundStatus;
+	}
+	public void setRefundStatus(String refundStatus) {
+		this.refundStatus = refundStatus;
+	}
+	public String getReason() {
+		return reason;
+	}
+	public void setReason(String reason) {
+		this.reason = reason;
+	}
+	public String getLiquidationStatus() {
+		return liquidationStatus;
+	}
+	public void setLiquidationStatus(String liquidationStatus) {
+		this.liquidationStatus = liquidationStatus;
+	}
+	
+}

+ 27 - 5
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -5,6 +5,8 @@ package com.goafanti.order.controller;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 
+import javax.servlet.http.HttpServletRequest;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -152,6 +154,10 @@ public class AdminNewOrderApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "合同图片"));
 			return res;
 		}
+		if (isSubmit==1&&orderNewService.checkORderTask(t.getOrderNo())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "主项目"));
+			return res;
+		}
 		if (StringUtils.isNotBlank(signDate)) {
 			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 			try {
@@ -209,9 +215,9 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	 * 订单列表
 	 */
 	@RequestMapping(value="/orderNewList", method = RequestMethod.GET)
-	public Result orderNewList(String name,String orderNo,String starTime,String endTime ,Integer specially ,Integer pageNo,Integer pageSize){
+	public Result orderNewList(String name,String orderNo,String starTime,String endTime ,Integer specially ,Integer distribution,Integer pageNo,Integer pageSize){
 		Result res=new Result();
-		res.data(orderNewService.orderNewList(name, orderNo, starTime, endTime, specially , pageNo, pageSize));
+		res.data(orderNewService.orderNewList(name, orderNo, starTime, endTime, specially , distribution, pageNo, pageSize));
 		return res;
 	}
 	
@@ -240,9 +246,9 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	 * 催款统计列表
 	 */
 	@RequestMapping(value="/dunOrderNewList", method = RequestMethod.GET)
-	public Result dunOrderNewList(String name,String orderNo,String starTime,String endTime,Integer orderStatus,Integer pageNo,Integer pageSize){
+	public Result dunOrderNewList(String name,String orderNo,String starTime,String endTime,Integer specially,Integer pageNo,Integer pageSize){
 		Result res=new Result();
-		res.data(orderNewService.dunOrderNewList(name, orderNo, starTime, endTime,orderStatus, pageNo, pageSize));
+		res.data(orderNewService.dunOrderNewList(name, orderNo, starTime, endTime,specially, pageNo, pageSize));
 		return res;
 	}
 	/**
@@ -259,7 +265,6 @@ public class AdminNewOrderApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "时间与描述","时间与描述"));
 			return res;
 		}
-		
 		res.data(orderNewService.createDunLog(dunId, dumTime, remarks));
 		return res;
 	}
@@ -323,5 +328,22 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		}
 		return res.data(orderNewService.updateApprovalOrder(orderNo,confirm,reason));
 	}
+	/**
+	 * 退单列表
+	 */
+	@RequestMapping(value="/orderRefundList", method = RequestMethod.GET)
+	public Result orderRefundList(String name,String orderNo,String starTime,String endTime,Integer specially,Integer pageNo,Integer pageSize){
+		Result res=new Result();
+		res.data(orderNewService.orderRefundList(name, orderNo, starTime, endTime,specially, pageNo, pageSize));
+		return res;
+	}
 	
+	/** 退单文件上传 **/
+	@RequestMapping(value = "/uploadRefundOrderFile", method = RequestMethod.POST)
+	public Result uploadRefundOrderFile(HttpServletRequest req,String sign){
+		Result res = new Result();
+		//order_refund_file
+		res.setData(handleFile(res, "/order_refund_file/", false, req, sign));
+		return res;
+	}
 }

+ 38 - 0
src/main/java/com/goafanti/order/controller/OrderProjectApiController.java

@@ -0,0 +1,38 @@
+package com.goafanti.order.controller;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.ErrorConstants;
+import com.goafanti.common.controller.CertifyApiController;
+import com.goafanti.common.utils.StringUtils;
+import com.goafanti.order.service.OrderProjectService;
+
+@RestController
+@RequestMapping(value = "/open/api/admin/orderProject")
+public class OrderProjectApiController extends CertifyApiController {
+	
+	@Autowired
+	private OrderProjectService	orderProjectService;
+	
+	
+	/**
+	 * 项目分配
+	 */
+	@RequestMapping(value = "/projectDistribution", method = RequestMethod.POST)
+	public Result projectDistribution(Integer taskId,String taskReceiverId){
+		Result res = new Result();
+		if(null==taskId || StringUtils.isBlank(taskReceiverId)){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "任务编号和受理人"));
+			return res;
+		}
+		res.setData(orderProjectService.updateProjectDistribution( taskId, taskReceiverId));
+		return res;
+	}
+	
+}

+ 1 - 1
src/main/java/com/goafanti/order/enums/ProcessStatus.java

@@ -20,7 +20,7 @@ public enum ProcessStatus {
 	/** 已派咨询师管理员 **/
 	YPZXSGLY(4,"已派咨询师管理员"),
 	/** 已部分派咨询师经理 **/
-	YBFPZXSGLY(5,"已部分派咨询师经理"),
+	YBFPZXSGLY(5,"已部分派咨询师经理"),
 	/** 已全部分派咨询师经理 **/
 	YQBFPZXSGLY(6,"已全部分派咨询师经理"),
 	/** 无效 **/

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

@@ -13,6 +13,7 @@ import com.goafanti.order.bo.BackOrderListBo;
 import com.goafanti.order.bo.BillListBo;
 import com.goafanti.order.bo.TDunLogListBo;
 import com.goafanti.order.bo.TOrderNewBo;
+import com.goafanti.order.bo.TOrderRefundBo;
 import com.goafanti.order.bo.TOrderTaskBo;
 
 public interface OrderNewService {
@@ -77,7 +78,7 @@ public interface OrderNewService {
 	 * @param pageSize
 	 * @return
 	 */
-	Pagination<TOrderNewBo> orderNewList(String name, String orderNo, String starTime, String endTime,Integer specially ,Integer pageNo, Integer pageSize);
+	Pagination<TOrderNewBo> orderNewList(String name, String orderNo, String starTime, String endTime,Integer specially ,Integer distribution,Integer pageNo, Integer pageSize);
 	/**
 	 * 订单审核
 	 * @param orderNo
@@ -97,7 +98,7 @@ public interface OrderNewService {
 	 * @param pageSize
 	 * @return
 	 */
-	Pagination<TOrderNewBo> dunOrderNewList(String name, String orderNo, String starTime, String endTime, Integer orderStatus,
+	Pagination<TOrderNewBo> dunOrderNewList(String name, String orderNo, String starTime, String endTime, Integer specially,
 			Integer pageNo, Integer pageSize);
 	/**
 	 * 新增催款记录
@@ -123,13 +124,32 @@ public interface OrderNewService {
 	 * @return
 	 */
 	int updateApprovalOrder(String orderNo,Integer confirm,String reason);
+	/**
+	 * 查看收款截点
+	 * @param orderNo
+	 * @return
+	 */
 	List<TOrderDun> selectOrderDun(String orderNo);
+	/**
+	 * 退单列表
+	 * @param name
+	 * @param orderNo
+	 * @param starTime
+	 * @param endTime
+	 * @param specially
+	 * @param pageNo
+	 * @param pageSize
+	 * @return
+	 */
+	Pagination<TOrderRefundBo> orderRefundList(String name, String orderNo, String starTime, String endTime, Integer specially,
+			Integer pageNo, Integer pageSize);
 	boolean checkOrderMain(TOrderTask t);
 	boolean chekeOrderStatus(String orderNo);
 	boolean chekeApprovalOrderStatus(String orderNo);
 	int deleteOrderNew(String orderNo);
 	boolean checkOderSettlementAmount(String orderNo);
-
+	boolean checkORderTask(String orderNo);
+	
 
 	
 }

+ 10 - 0
src/main/java/com/goafanti/order/service/OrderProjectService.java

@@ -0,0 +1,10 @@
+package com.goafanti.order.service;
+
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.order.bo.TOrderRefundBo;
+
+public interface OrderProjectService {
+
+	int updateProjectDistribution(Integer taskId, String taskReceiverId);
+	
+}

+ 54 - 15
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -1,6 +1,6 @@
 package com.goafanti.order.service.impl;
 
-
+
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -41,6 +41,7 @@ import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.customer.bo.LockingReleaseBo;
 import com.goafanti.order.bo.TDunLogListBo;
 import com.goafanti.order.bo.TOrderNewBo;
+import com.goafanti.order.bo.TOrderRefundBo;
 import com.goafanti.order.bo.TOrderTaskBo;
 import com.goafanti.order.enums.ActiveState;
 import com.goafanti.order.enums.ApprovalNewState;
@@ -202,20 +203,22 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				if (t.getId()==null||t.getId().equals("")) {//Id为空新增
 					t.setId(UUID.randomUUID().toString());
 					t.setDunBy(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
+					t.setDunStatus(0);//催款中
 					tOrderDunMapper.insertSelective(t);
 				}else {
 					tOrderDunMapper.updateByPrimaryKeySelective(t);
 				}
-				boolean flag=true;
-				String id="";
-				for (TOrderDun t2 : l2) {
+				
+			}
+			boolean flag=true;
+			for (TOrderDun t2 : l2) {
+				for (TOrderDun t : l) {
 					if (t2.getId().equals(t.getId())) {//查询集合与返回集合比较查出删除项
 						flag=false;
 					}
-					id=t2.getId();
 				}
-				if (!id.equals("")&&flag) {
-					tOrderDunMapper.deleteByPrimaryKey(id);
+				if (t2.getId()!=null&&flag) {
+					tOrderDunMapper.deleteByPrimaryKey(t2.getId());
 				}
 			}
 		}
@@ -226,17 +229,18 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<TOrderNewBo> orderNewList(String name, String orderNo, String starTime, String endTime,Integer specially, Integer pageNo,
+	public Pagination<TOrderNewBo> orderNewList(String name, String orderNo, String starTime, String endTime,Integer specially,Integer distribution, Integer pageNo,
 			Integer pageSize) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		if(pageSize==null||pageSize<0)pageSize=10;
 		if(pageNo==null||pageNo<0)pageNo=1;
 		if (specially!=null&&specially==0) {
 			params.put("aid", TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
-			params.put("specially",specially);
-		}else {
-			params.put("specially",specially);
+		}else if(specially!=null&&specially==4){
+			params.put("distribution",distribution);
 		}
+			params.put("specially",specially);
+		
 		if (StringUtils.isNotBlank(name)) params.put("name", name);
 		if (StringUtils.isNotBlank(orderNo)) params.put("orderNo", orderNo);
 		if (StringUtils.isNotBlank(starTime)) params.put("starTime", starTime);
@@ -282,7 +286,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<TOrderNewBo> dunOrderNewList(String name, String orderNo, String starTime, String endTime,
-			Integer orderStatus, Integer pageNo, Integer pageSize) {
+			Integer specially, Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		if(pageSize==null||pageSize<0)pageSize=10;
 		if(pageNo==null||pageNo<0)pageNo=1;
@@ -323,13 +327,16 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@Override
 	public int addOrderRefund(TOrderRefundWithBLOBs t) {
-		TOrderNew tOrder= tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
 		t.setRefundStatus(refundState.DSH.getCode());
 		t.setCreateTime(new Date());
 		t.setInitiate(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
 		t.setAccept("1");
 		//t.setAccept(tOrder.getFinanceId());
 		t.setResult("");
+		TOrderNew tOrder=new TOrderNew(); 
+		tOrder.setOrderNo(t.getOrderNo());
+		tOrder.setOrderStatus(OrderNewState.YTD.getCode());
+		tOrderNewMapper.updateByPrimaryKeySelective(tOrder);
 		return tOrderRefundMapper.insertSelective(t);
 	}
 
@@ -414,12 +421,44 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@Override
 	public boolean checkOderSettlementAmount(String orderNo) {
 		TOrderNew tOrder= tOrderNewMapper.selectByPrimaryKey(orderNo);
-		if (tOrder.getSettlementAmount()==null||tOrder.getSettlementAmount().doubleValue()==0){
+		if (tOrder.getSettlementAmount()==null||
+				tOrder.getSettlementAmount().doubleValue()==0||
+					tOrder.getOrderStatus()==OrderNewState.YTD.getCode()){
 				return true;
 		}
 		return false;
 	}
+
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<TOrderRefundBo> orderRefundList(String name, String orderNo, String starTime, String endTime, Integer specially,
+			Integer pageNo, Integer pageSize) {
+			Map<String, Object> params = new HashMap<String, Object>();
+			if(pageSize==null||pageSize<0)pageSize=10;
+			if(pageNo==null||pageNo<0)pageNo=1;
+			if (StringUtils.isNotBlank(name)) params.put("name", name);
+			if (StringUtils.isNotBlank(orderNo)) params.put("orderNo", orderNo);
+			if (StringUtils.isNotBlank(starTime)) params.put("starTime", starTime);
+			if (StringUtils.isNotBlank(endTime)) params.put("endTime", endTime+" 23:59:59");
+			Pagination<TOrderRefundBo> p = (Pagination<TOrderRefundBo>)findPage("selectOrderRefundListByPage", "selectOrderRefundListCount", params, pageNo, pageSize);
+			return p;
+		
+	}
+
+
+
+	@Override
+	public boolean checkORderTask(String orderNo) {
+		List<TOrderTaskBo> list=tOrderTaskMapper.selectOrderTask(orderNo);
+		for (TOrderTaskBo t : list) {
+			if (t.getMain()==1) {
+				return false;
+			}
+		}
+		return true;
+	}
+	
 	
 	
-	
 }

+ 57 - 0
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -0,0 +1,57 @@
+package com.goafanti.order.service.impl;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.goafanti.common.dao.TOrderNewMapper;
+import com.goafanti.common.dao.TOrderTaskMapper;
+import com.goafanti.common.model.TOrderNew;
+import com.goafanti.common.model.TOrderTask;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.order.bo.TOrderNewBo;
+import com.goafanti.order.bo.TOrderRefundBo;
+import com.goafanti.order.bo.TOrderTaskBo;
+import com.goafanti.order.enums.ProcessStatus;
+import com.goafanti.order.service.OrderProjectService;
+import com.goafanti.techproject.enums.TaskState;
+@Service
+public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> implements OrderProjectService {
+	@Autowired
+	private TOrderTaskMapper tOrderTaskMapper;
+	@Autowired
+	private TOrderNewMapper	tOrderNewMapper;
+	
+	@Override
+	public int updateProjectDistribution(Integer taskId, String taskReceiverId) {
+		TOrderTask t=tOrderTaskMapper.selectByPrimaryKey(taskId);
+		t.setTaskStatus(TaskState.DISTRIBUTION.getCode());
+		t.setTaskReceiver(taskReceiverId);
+		tOrderTaskMapper.updateByPrimaryKeySelective(t);
+		List<TOrderTaskBo> taskBos=tOrderTaskMapper.selectOrderTask(t.getOrderNo());
+		TOrderNew tNew=new TOrderNew();
+		tNew.setOrderNo(t.getOrderNo());
+		int i=0;
+		for (TOrderTaskBo to : taskBos) {
+			if (to.getTaskStatus()==TaskState.DISTRIBUTION.getCode()) {
+				i++;
+			}
+			
+		}
+		if (i==taskBos.size()) {
+			tNew.setProcessStatus(ProcessStatus.YQBFPZXSGLY.getCode());
+		}else{
+			tNew.setProcessStatus(ProcessStatus.YBFPZXSGLY.getCode());
+		}
+		tOrderNewMapper.updateByPrimaryKeySelective(tNew);
+		return 1;
+	}
+
+	
+}