Browse Source

上传图片,删除图片修改

anderx 3 years ago
parent
commit
c91856ebbe

+ 20 - 222
src/main/java/com/goafanti/app/controller/AppOrderController.java

@@ -19,144 +19,21 @@ import com.goafanti.order.service.OrderService;
 @RestController
 @RequestMapping(value = "/app/order")
 public class AppOrderController extends CertifyApiController{
-	
+
 	@Resource
 	private OrderService orderServiceImpl;
-	/**
-	 * 进入添加意向订单
-	 * @param commodityId 商品编号
-	 * @param commodityType 订单类型
-	 * @return
-	 */
-	@RequestMapping(value = "/toAddIntention" , method = RequestMethod.GET)
-	public Result toAddIntention(String commodityId,Integer commodityType){
-		Result res = new Result();
-		if(StringUtils.isBlank(commodityId) || null == commodityType){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","商品编号和商品类型"));
-			return res;
-		}
-		if(!CommodityType.containsType(commodityType)){
-			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","订单类型错误"));
-			return res;
-		}
-		res.setData(orderServiceImpl.selectCommodityDetail(commodityId, commodityType));
-		return res;
-	}
-	
-	/**
-	 * 添加意向订单
-	 * @param orderNo 订单编号
-	 * @param commodityId 商品id
-	 * @param commodityMode 商品规格
-	 * @param createTime 创建时间
-	 * @param commodityQuantity 商品数量
-	 * @param commodityType 商品类型
-	 * @return 
-	 * @throws ParseException 
-	 * @throws NumberFormatException 
-	 */
-	@RequestMapping(value = "/addIntention" , method = RequestMethod.POST)
-	public Result addIntention(String orderNo,String commodityId,String commodityMode,Integer commodityQuantity,Integer commodityType,
-			String createTime,String remarks) throws NumberFormatException, ParseException {
-		Result res = new Result();
-		if(StringUtils.isBlank(orderNo)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
-			return res;
-		}
-		if(StringUtils.isBlank(commodityId)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","商品id"));
-			return res;
-		}
-		if(StringUtils.isBlank(createTime)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单时间"));
-			return res;
-		}
-		if(commodityQuantity == null){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单数量"));
-			return res;
-		}
-		if(commodityType == null){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单类型"));
-			return res;
-		}
-		if(!CommodityType.containsType(commodityType)){
-			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","订单类型"));
-			return res;
-		}
-		orderServiceImpl.addIntention(orderNo,commodityId,commodityMode,commodityQuantity,commodityType,createTime,remarks);
-		return res;
-	}
-	
-	/**
-	 * 查看订单列表
-	 * @param confirm  我的意向-false 我的订单 - true
-	 * @return
-	 */
-	@RequestMapping(value = "/orderList", method = RequestMethod.POST)
-	public Result orderList(boolean confirm,Integer pageNo,Integer pageSize) {
-		Result res = new Result();
-		res.setData(orderServiceImpl.selectOrderList(confirm,pageNo,pageSize));
-		return res;
-	}
-	
-	/**
-	 * 查看订单详情
-	 * @return
-	 */
-	@RequestMapping(value ="/orderDetails", method = RequestMethod.GET)
-	public Result orderDetails(String orderNo) {
-		Result res = new Result();
-		if(StringUtils.isBlank(orderNo)){
-			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","订单编号"));
-			return res;
-		}
-		res.setData(orderServiceImpl.selectOrderDetail(orderNo));
-		return res;
-	}
-	
-	/**
-	 * 订单支付(首付)
-	 * @param orderNo 订单编号
-	 * @param fundAmount 支付金额
-	 * @return 备注
-	 */
-	@RequestMapping(value = "/payForFirst", method = RequestMethod.POST)
-	public Result payForFirst(String orderNo,String fundAmount,String remarks) {
-		Result res = new Result();
-		if(StringUtils.isBlank(orderNo)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
-			return res;
-		}
-		if(StringUtils.isBlank(fundAmount)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","支付金额"));
-			return res;
-		}
-		orderServiceImpl.updatePayForFirst(orderNo,new BigDecimal(fundAmount),remarks);
-		return res;
-	}
-	
-	/**
-	 * 支付尾款
-	 * @param orderNo 订单编号
-	 * @param fundAmount 支付金额
-	 * @param remarks 备注
-	 * @return
-	 */
-	@RequestMapping(value = "/payForLast", method = RequestMethod.POST)
-	public Result payForLast(String orderNo,String fundAmount,String remarks){
-		Result res = new Result();
-		if(StringUtils.isBlank(orderNo)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
-			return res;
-		}
-		if(StringUtils.isBlank(fundAmount)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","支付金额"));
-			return res;
-		}
-		orderServiceImpl.updatePayForLast(orderNo,new BigDecimal(fundAmount),remarks);
-		return res;
-	}
-	
+
+
+
+
+
+
+
+
+
+
+
+
 	/**
 	 * 查询支付流水列表
 	 * @param orderNo
@@ -165,92 +42,13 @@ public class AppOrderController extends CertifyApiController{
 	@RequestMapping(value = "/fundingHistory", method = RequestMethod.POST)
 	public Result fundingHistory(String orderNo,Integer pageNo,Integer pageSize) {
 		Result res = new Result();
-		if(StringUtils.isNotBlank(orderNo))
-			res.setData(orderServiceImpl.selectOrderBillList(orderNo,pageNo,pageSize));
+		if (StringUtils.isNotBlank(orderNo))
+			res.setData(orderServiceImpl.selectOrderBillList(orderNo, pageNo, pageSize));
 		else
-			res.setData(orderServiceImpl.selectOrderBillList(null,pageNo,pageSize));
-		return res;
-	}
-	
-	/**
-	 * 订单提现
-	 * @param orderNo
-	 * @return
-	 */
-	@RequestMapping(value = "/applyForWithdraw", method = RequestMethod.POST)
-	public Result applyForWithdraw(String orderNo,String remarks){
-		Result res = new Result();
-		if(StringUtils.isBlank(orderNo)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
-			return res;
-		}
-		orderServiceImpl.updateApplyForWithdraw(orderNo,remarks);
-		return res;
-	}
-	
-	/**
-	 * 取消订单
-	 * @param orderNo
-	 * @return
-	 */
-	@RequestMapping(value = "/applyForCancel", method = RequestMethod.POST)
-	public Result applyForCancel(String orderNo){
-		Result res = new Result();
-		if(StringUtils.isBlank(orderNo)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
-			return res;
-		}
-		orderServiceImpl.updateApplyForCancel(orderNo);
-		return res;
-	}
-	
-	/**
-	 * 确认意向
-	 * @param orderNo
-	 * @param confirm
-	 * @return
-	 */
-	@RequestMapping(value="/confirmIntention", method = RequestMethod.POST)
-	public Result confirmIntention(String orderNo,boolean confirm){
-		Result res = new Result();
-		if(StringUtils.isBlank(orderNo)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
-			return res;
-		}
-		orderServiceImpl.updateConfirmIntention(orderNo,confirm);
-		return res;
-	}
-	
-	/**
-	 * 申请退款
-	 * @param orderNo
-	 * @return
-	 */
-	@RequestMapping(value = "/applyForRefund",method = RequestMethod.POST)
-	public Result applyForRefund(String orderNo){
-		Result res = new Result();
-		if(StringUtils.isBlank(orderNo)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
-			return res;
-		}
-		orderServiceImpl.updateApplyForRefund(orderNo);
-		return res;
-	}
-	
-	/**
-	 * 确认退款
-	 * @param orderNo
-	 * @param confirm
-	 * @return
-	 */
-	@RequestMapping(value = "/confirmRefund", method = RequestMethod.POST)
-	public Result confirmRefund(String orderNo,boolean confirm){
-		Result res = new Result();
-		if(StringUtils.isBlank(orderNo)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
-			return res;
-		}
-		orderServiceImpl.updateConfirmRefund(orderNo,confirm);
+			res.setData(orderServiceImpl.selectOrderBillList(null, pageNo, pageSize));
 		return res;
+
+
 	}
-}
+
+}

+ 54 - 12
src/main/java/com/goafanti/common/controller/BaseApiController.java

@@ -9,6 +9,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.goafanti.order.enums.OrderImgEnums;
 import org.apache.commons.fileupload.servlet.ServletFileUpload;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
@@ -32,7 +33,7 @@ public class BaseApiController extends BaseController {
 	private String	uploadPrivatePath	= null;
 
 	/**
-	 * 
+	 *
 	 * @param request
 	 * @return
 	 */
@@ -49,7 +50,7 @@ public class BaseApiController extends BaseController {
 	}
 
 	/**
-	 * 
+	 *
 	 * @param res
 	 * @param path
 	 * @param isPrivate
@@ -75,10 +76,51 @@ public class BaseApiController extends BaseController {
 		}
 		return fileName;
 	}
-	
+
+
+	protected String uploadFile(Result res, String path,  HttpServletRequest req,String orderNo, String sign) {
+		List<MultipartFile> files = getFiles(req);
+		String fileName = "";
+		if (!files.isEmpty()) {
+			try {
+				MultipartFile mf = files.get(0);
+				fileName = FileUtils.orderFileName(mf,orderNo,path,sign);
+				mf.transferTo(toFile(fileName));
+				LoggerUtils.debug(getClass(), fileName + " 文件上传成功");
+			} catch (Exception e) {
+				LoggerUtils.error(getClass(), "文件上传失败", e);
+				res.getError().add(buildError("", "文件上传失败!"));
+			}
+		} else {
+			res.getError().add(buildError("", "文件为空,上传失败!"));
+		}
+		return fileName;
+	}
+
+	protected Result deleteFile (Result res,String fileName){
+		if (StringUtils.isBlank(fileName)) {
+			res.getError().add(buildError("文件路径错误"));
+			return res;
+		}
+		try {
+			if (!com.goafanti.common.utils.excel.FileUtils.checkAllowDownload(fileName)) {
+				throw new Exception("文件名称非法,不允许删除。 ");
+			}
+			String filePath = uploadPath + "/" + fileName;
+			com.goafanti.common.utils.excel.FileUtils.deleteFile(filePath);
+			if (fileName.contains(OrderImgEnums.CONTRACT.getCode())){
+
+			}
+			res.setData(1);
+		} catch (Exception e) {
+			LoggerUtils.error(PublicController.class, "删除文件失败", e);
+		}
+		return res;
+	}
+
 
 	/**
-	 * 
+	 *
 	 * @param res
 	 * @param isPrivate
 	 * @param req
@@ -105,22 +147,22 @@ public class BaseApiController extends BaseController {
 	}
 
 	/**
-	 * 
+	 *
 	 * @param res
 	 * @param fileName
 	 * @param filePath
 	 */
 	protected void downloadFile(HttpServletResponse res, String fileName, String filePath) {
 		FileUtils.downloadFile(res, fileName,  uploadPath+ filePath);
-		
+
 	}
 
 	protected void downloadUnPrivateFile(HttpServletResponse res, String fileName, String filePath) {
 		FileUtils.downloadFile(res, fileName, uploadPrivatePath + filePath);
 	}
-	
-	
-	
+
+
+
 
 	private File buildFile(String filePath) {
 		File toFile = new File(filePath);
@@ -129,7 +171,7 @@ public class BaseApiController extends BaseController {
 	}
 
 	/**
-	 * 
+	 *
 	 * @param fileName
 	 * @return
 	 */
@@ -138,7 +180,7 @@ public class BaseApiController extends BaseController {
 	}
 
 	/**
-	 * 
+	 *
 	 * @param fileName
 	 * @return
 	 */
@@ -147,7 +189,7 @@ public class BaseApiController extends BaseController {
 	}
 
 	/**
-	 * 
+	 *
 	 * @param fileName
 	 * @return
 	 */

+ 16 - 26
src/main/java/com/goafanti/common/controller/PortalController.java

@@ -63,7 +63,7 @@ public class PortalController extends BaseController {
 	private BusinessProjectService	businessProjectService;
 	@Resource
 	private OrderService	orderService;
-	
+
 	private static final String UNIT = "万元";
 
 	private static final int MULTIPLE = 20;
@@ -334,7 +334,7 @@ public class PortalController extends BaseController {
 			if (StringUtils.isNotBlank(achievementdetail.getFieldBS())) {
 				b = Boolean.TRUE;
 			}
-			
+
 			field += (a ? achievementdetail.getFieldAS() : "") + (a && b ? DELIMITER : "")
 					+ (b ? achievementdetail.getFieldBS() : "");
 			achievementdetail.setField(field);
@@ -728,15 +728,15 @@ public class PortalController extends BaseController {
 				}
 			}
 		}
-		
-		
+
+
 		mv.setViewName("/portal/technologyTrading/achievementOrder");
 		mv.addObject("achievementdetail", achievementdetail);
 		mv.addObject("reachievementlist", reachievementlist);
 		return mv;
 	}
-	
-	
+
+
 	/**
 	 * 下单页面(需求)
 	 */
@@ -799,7 +799,7 @@ public class PortalController extends BaseController {
 				demand.setPictureUrl(picurl[0]);
 			}
 		}
-		
+
 		/*--------------查询精品需求---------------*/
 		List<DemandListBo> boutiquedemand = demandService.selectDemandList(1);
 		List<DemandListBo> reboutiquedemand = new ArrayList<DemandListBo>();
@@ -888,7 +888,7 @@ public class PortalController extends BaseController {
 		mv.addObject("redemandlist", redemandlist);
 		return mv;
 	}
-	
+
 	@RequestMapping(value = "/portal/subscriberDetail", method = RequestMethod.GET)
 	public ModelAndView subscriberDetail(HttpServletRequest request, ModelAndView modelview, String uid, Integer type) {
 		ModelAndView mv = new ModelAndView();
@@ -966,7 +966,7 @@ public class PortalController extends BaseController {
 		return mv;
 
 	}
-	
+
 	/**
 	 * 服务
 	 */
@@ -987,7 +987,7 @@ public class PortalController extends BaseController {
 		mv.setViewName("");
 		return mv;
 	}
-	
+
 	/**
 	 * 项目详情
 	 */
@@ -998,13 +998,13 @@ public class PortalController extends BaseController {
 		mv.setViewName("portal/service/projectDetails");
 		//获取项目详情
 		ProjectDetailBo p=businessProjectService.ProjectDetail(id);
-		if (StringUtils.isNotBlank(p.getIntroduce())) 
+		if (StringUtils.isNotBlank(p.getIntroduce()))
 			p.setIntroduce(p.getIntroduce().replace("\n","<br>"));
-		if (StringUtils.isNotBlank(p.getValueEffect())) 
+		if (StringUtils.isNotBlank(p.getValueEffect()))
 		p.setValueEffect(p.getValueEffect().replace("\n", "<br>"));
-		if (StringUtils.isNotBlank(p.getClientSize())) 
+		if (StringUtils.isNotBlank(p.getClientSize()))
 		p.setClientSize(p.getClientSize().replace("\n", "<br>"));
-		
+
 		mv.addObject("projectDetail",p);
 		//获取3条推荐
 		Pagination<ProjectBo> ps=businessProjectService.recommendProjectList(null,3);
@@ -1012,7 +1012,7 @@ public class PortalController extends BaseController {
 		mv.addObject("recommend", list);
 		return mv;
 	}
-	
+
 	/**
 	 * 咨询师详情
 	 */
@@ -1026,15 +1026,5 @@ public class PortalController extends BaseController {
 		mv.addObject("recommend",userIdentityService.consultantList(null,pSize));
 		return mv;
 	}
-	/**
-	 * 服务意向
-	 */
-	@RequestMapping(value = "portal/service/purpose", method = RequestMethod.GET)
-	public ModelAndView purpose(HttpServletRequest request, ModelAndView modelview,String commodityId,Integer commodityType ) {
-		ModelAndView mv = new ModelAndView();
-		mv.setViewName("portal/service/purpose");
-		//获取服务意向参数
-		mv.addObject("purpose", orderService.selectCommodityDetail(commodityId, commodityType));
-		return mv;
-	}
+
 }

+ 31 - 0
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -18,6 +18,7 @@ import com.goafanti.common.model.TOrderTask;
 import com.goafanti.common.utils.excel.Excel;
 import com.goafanti.order.bo.TOrderTaskBo;
 import com.goafanti.order.enums.NewProjectStatus;
+import com.goafanti.order.enums.OrderImgEnums;
 import com.goafanti.order.enums.ProjectStage;
 import com.goafanti.order.enums.ProjectType;
 import com.goafanti.order.service.OrderProjectService;
@@ -738,6 +739,36 @@ public class PublicController extends CertifyApiController {
               }
           }
 
+		/**
+		 * 	通用下载请求
+		 *
+		 * @param fileName 文件名称
+		 */
+		@RequestMapping("/deleteFile")
+		public Result deleteFile(String fileName) {
+			Result res = new Result();
+			if (StringUtils.isBlank(fileName)) {
+				res.getError().add(buildError("文件路径错误"));
+				return res;
+			}
+			try {
+				if (!FileUtils.checkAllowDownload(fileName)) {
+					throw new Exception("文件名称非法,不允许删除。 ");
+				}
+				String filePath = uploadPath + "/" + fileName;
+				FileUtils.deleteFile(filePath);
+				if (fileName.contains(OrderImgEnums.CONTRACT.getCode())){
+
+				}
+				res.setData(1);
+			} catch (Exception e) {
+				LoggerUtils.error(PublicController.class, "删除文件失败", e);
+			}
+			return res;
+		}
+
+
+
           @RequestMapping("/getWxConfig")
           public Result getWxConfig() {
         	  Result res =new Result();

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

@@ -29,7 +29,7 @@ public class FileUtils {
 
 	/**
 	 * response 输出JSON
-	 * 
+	 *
 	 * @throws IOException
 	 */
 	public static void out(HttpServletResponse response, String jsonStr) {
@@ -51,7 +51,7 @@ public class FileUtils {
 
 	/**
 	 * Excel报表导出
-	 * 
+	 *
 	 * @param response
 	 * @param fileName
 	 * @param workbook
@@ -85,7 +85,7 @@ public class FileUtils {
 
 	/**
 	 * 根据上传文件 拼接fileName
-	 * 
+	 *
 	 * @param mf
 	 * @param isPrivate
 	 * @param sign
@@ -104,7 +104,7 @@ public class FileUtils {
 				|| sign.indexOf("demand_picture") != -1 || sign.indexOf("demand_text_file") != -1
 				|| sign.indexOf("achievement_technical_picture") != -1|| sign.indexOf("order_file") != -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("lecture_picture") != -1|| sign.indexOf("cover_picture") != -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
@@ -125,10 +125,10 @@ public class FileUtils {
 		}
 		return fileName;
 	}
-	
+
 	/**
 	 * 根据上传文件 拼接fileName
-	 * 
+	 *
 	 * @param mf
 	 * @param isPrivate
 	 * @param sign
@@ -155,8 +155,22 @@ public class FileUtils {
 	}
 
 	/**
+	 * 根据上传文件 拼接fileName
+	 *
+	 * @param mf
+	 * @param sign
+	 * @param path
+	 * @return
+	 */
+	public static String orderFileName(MultipartFile mf, String orderNo, String path,String sign) {
+		String suffix = mf.getOriginalFilename().substring(mf.getOriginalFilename().lastIndexOf("."));
+		String fileName =  path + orderNo + "/" + System.nanoTime()+"_"+sign + suffix;
+		return fileName;
+	}
+
+	/**
 	 * 获取下载文件名称
-	 * 
+	 *
 	 * @param path
 	 * @return
 	 */
@@ -226,7 +240,7 @@ public class FileUtils {
 
 	/**
 	 * 拼接文件路径
-	 * 
+	 *
 	 * @param params
 	 * @return
 	 */
@@ -243,7 +257,7 @@ public class FileUtils {
 
 	/**
 	 * 拼接文件名字
-	 * 
+	 *
 	 * @param params
 	 * @return
 	 */
@@ -261,7 +275,7 @@ public class FileUtils {
 	}
 
 	/**
-	 * 
+	 *
 	 * @param response
 	 * @param fileName
 	 * @param realFilePath

+ 42 - 464
src/main/java/com/goafanti/order/controller/AdminOrderApiController.java

@@ -6,6 +6,7 @@ import java.util.List;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
+import com.goafanti.order.enums.OrderImgEnums;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -45,156 +46,14 @@ public class AdminOrderApiController extends CertifyApiController {
 		return res;
 	}
 
-	/**
-	 * 订单详细
-	 * @param orderNo
-	 * @return
-	 */
-	@RequestMapping(value = "/serviceOrderDetail",method = RequestMethod.GET)
-	public Result serviceOrderDetail(String orderNo){
-		Result res = new Result();
-		if(StringUtils.isBlank(orderNo)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "订单编号"));
-			return res;
-		}
-		res.setData(orderServiceImpl.selectServiceOrderDetail(orderNo));
-		return res;
-	}
 
-	/**
-	 * 修改订单
-	 * @param orderNo
-	 * @param firstPayment
-	 * @param orderAmount
-	 * @param signFirstPayment
-	 * @param signTotalAmount
-	 * @param approval
-	 * @param orderRemarks
-	 * @return
-	 */
-	@RequestMapping(value = "/updateServiceOrder",method = RequestMethod.POST)
-	public Result updateServiceOrder(String orderNo,String signFirstPayment,String signTotalAmount,
-			String contractNo,String orderRemarks,String contractPictureUrl){
-		Result res = new Result();
-		if(StringUtils.isBlank(orderNo)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "订单编号"));
-			return res;
-		}
-		if(StringUtils.isBlank(signFirstPayment) || StringUtils.isBlank(signTotalAmount)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "订单金额 和 首付金额"));
-			return res;
-		}
-		/*if(StringUtils.isBlank(contractPictureUrl)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "合同图片"));
-			return res;
-		}*/
-		orderServiceImpl.updateServiceOrder(orderNo,signFirstPayment,signTotalAmount,contractNo,
-				orderRemarks,contractPictureUrl);
-		return res;
-	}
 
-	/**
-	 * 签单
-	 * @param orderNo
-	 * @param signFirstPayment
-	 * @param signTotalAmount
-	 * @param approval
-	 * @param orderRemarks
-	 * @return
-	 */
-	@RequestMapping(value = "/signServiceOrder", method = RequestMethod.POST)
-	public Result signServiceOrder(String orderNo,String contractNo,String signFirstPayment,String signTotalAmount,
-			String approval,String orderRemarks,String signTime,String contractPictureUrl,String userBusinessList,String uid){
-		Result res = new Result();
-		if(StringUtils.isBlank(orderNo)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "订单编号", "订单编号"));
-			return res;
-		}
-		if(StringUtils.isBlank(signFirstPayment) || StringUtils.isBlank(signTotalAmount)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "订单金额 和 首付金额", "订单金额 和 首付金额"));
-			return res;
-		}
-		if(null == approval){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "特批状态", "特批状态"));
-			return res;
-		}
-		if(StringUtils.isBlank(contractPictureUrl)){
-		res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "合同图片", "合同图片"));
-		return res;
-		}
-		if(StringUtils.isBlank(uid)/* || StringUtils.isBlank(ocbId)*/){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, ""));
-			return res;
-		}
-		orderServiceImpl.updateSignServiceOrder(orderNo,contractNo,signFirstPayment,signTotalAmount,approval,orderRemarks,signTime);
-		//自动把签单任务标记成已签单
-		JSONArray ja = (JSONArray) JSON.parse(userBusinessList);
-		List<BusinessListBo> list = new ArrayList<BusinessListBo>();
-		if (ja != null && !ja.isEmpty()) {
-			BusinessListBo userBusiness = null;
-			for (int idx = 0; idx < ja.size(); idx++) {
-				userBusiness = ja.getJSONObject(idx).toJavaObject(BusinessListBo.class);
-				list.add(userBusiness);
-			}
-		}
-		FollowBusinessBo fbb = new FollowBusinessBo();
-		//fbb.setOcbId(ocbId);
-		fbb.setUid(uid);
-		fbb.setContactType(AFTConstants.DEFAULT_CONTACT_TYPE);
-		fbb.setResult(AFTConstants.DEFAULT_RESULT);
-		fbb.setUserBusinessList(list);
-		orderServiceImpl.addBusinessProjectId(fbb);
-		return res;
-	}
 
-	/**
-	 * 订单详情
-	 * @param orderNo
-	 * @return
-	 */
-	@RequestMapping(value = "/getServiceOrderDetail", method = RequestMethod.GET)
-	public Result getServiceOrderDetail(String orderNo){
-		Result res = new Result();
-		if(StringUtils.isBlank(orderNo)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "订单编号"));
-			return res;
-		}
-		res.setData(orderServiceImpl.selectServiceOrderDetail(orderNo));
-		return res;
-	}
 
-	/**
-	 * 确认意向
-	 * @param orderNo
-	 * @param confirm
-	 * @return
-	 */
-	@RequestMapping(value="/confirmIntention", method = RequestMethod.POST)
-	public Result confirmIntention(String orderNo,boolean confirm){
-		Result res = new Result();
-		if(StringUtils.isBlank(orderNo)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
-			return res;
-		}
-		orderServiceImpl.updateConfirmIntention(orderNo,confirm);
-		return res;
-	}
 
-	/**
-	 * 作废订单
-	 * @param orderNo
-	 * @return
-	 */
-	@RequestMapping(value = "/revokeOrder", method = RequestMethod.GET)
-	public Result revokeOrder(String orderNo){
-		Result res = new Result();
-		if(StringUtils.isBlank(orderNo)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
-			return res;
-		}
-		orderServiceImpl.updateRevokeOrder(orderNo);
-		return res;
-	}
+
+
+
 
 	/**
 	 * 模糊查询业务项目
@@ -219,42 +78,9 @@ public class AdminOrderApiController extends CertifyApiController {
 		return res;
 	}
 
-	/**
-	 * 获取订单商品信息
-	 * @param orderNo
-	 * @return
-	 */
-	@RequestMapping(value = "/getOrderCommodity",method = RequestMethod.GET)
-	public Result getOrderCommodity(String orderNo){
-		Result res = new Result();
-		res.setData(orderServiceImpl.selectOrderCommodity(orderNo));
-		return res;
-	}
 
 
-	/**
-	 * 添加订单商品
-	 * @param orderNo
-	 * @param commodityId
-	 * @param commodityMode
-	 * @param commodityQuantity
-	 * @param commodityType
-	 * @param discountPrice
-	 * @param remarks
-	 * @return
-	 */
-	@RequestMapping(value = "/addOrderCommodity",method = RequestMethod.POST)
-	public Result addOrderCommodity(String orderNo, String commodityId, String commodityName,String commodityMode, Integer commodityQuantity,Integer commodityType,
-			String commodityPrice, String discountPrice,String commodityFirstPayment,String discountFirstPayment,String remarks){
-		Result res = new Result();
-		if(StringUtils.isBlank(orderNo)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
-			return res;
-		}
-		orderServiceImpl.addOrderCommodity(orderNo,commodityId,commodityName,commodityMode,commodityQuantity,commodityType,
-				commodityPrice,discountPrice,commodityFirstPayment,discountFirstPayment,remarks);
-		return res;
-	}
+
 
 	/**
 	 * 进入修改商品信息
@@ -272,42 +98,9 @@ public class AdminOrderApiController extends CertifyApiController {
 		return res;
 	}
 
-	/**
-	 * 修改订单商品
-	 * @param detailId
-	 * @param orderNo
-	 * @param discountPrice
-	 * @param discountFirstPayment
-	 * @param commodityQuantity
-	 * @param remarks
-	 * @return
-	 */
-	@RequestMapping(value = "/updateOrderCommodity", method = RequestMethod.POST)
-	public Result updateOrderCommodity(String detailId,String discountPrice,String discountFirstPayment,Integer commodityQuantity,String remarks){
-		Result res = new Result();
-		if(StringUtils.isBlank(detailId)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","详情编号"));
-			return res;
-		}
-		orderServiceImpl.updateOrderCommodity(detailId,discountPrice, discountFirstPayment,commodityQuantity, remarks);
-		return res;
-	}
 
-	/**
-	 * 删除订单商品
-	 * @param detailId
-	 * @return
-	 */
-	@RequestMapping(value = "/deleteOrderCommodity",method = RequestMethod.GET)
-	public Result deleteOrderCommodity(String detailId){
-		Result res = new Result();
-		if(StringUtils.isBlank(detailId)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","详情编号"));
-			return res;
-		}
-		orderServiceImpl.deleteOrderCommodity(detailId);
-		return res;
-	}
+
+
 
 	/**
 	 * 查询分管部门
@@ -344,29 +137,49 @@ public class AdminOrderApiController extends CertifyApiController {
 		return res;
 	}
 
-	/**
-	 * 审批特批订单
-	 * @param orderNo
-	 * @return
-	 */
-	@RequestMapping(value = "/approvalServiceOrder",method = RequestMethod.GET)
-	public Result approvalServiceOrder(String orderNo,Integer confirm){
-		Result res = new Result();
-		orderServiceImpl.updateApprovalServiceOrder(orderNo,confirm);
-		return res;
-	}
 
 
 
 
 	/** 图片上传 **/
 	@RequestMapping(value = "/uploadOrderImg", method = RequestMethod.POST)
-	public Result uploadOrderImg(HttpServletRequest req,String sign){
+	public Result uploadOrderImg(HttpServletRequest req,String orderNo,String sign){
 		Result res = new Result();
-		res.setData(handleFile(res, "/order_file/", false, req, sign));
+		if (StringUtils.isBlank(orderNo)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"订单编号","订单编号"));
+			return  res;
+		}
+		if (!sign.equals(OrderImgEnums.CONTRACT.getCode())&&
+				!sign.equals(OrderImgEnums.SUPPLEMENT.getCode())&&
+				!sign.equals(OrderImgEnums.CONTENT.getCode())){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"sign","sign"));
+			return  res;
+		}
+		String imageUrl=uploadFile(res, "/new_order_file/", req,orderNo, sign);
+		res.setData(orderServiceImpl.pushOrderImg(orderNo,imageUrl,sign));
+		return res;
+	}
+
+	@RequestMapping(value = "/deleteOrderImg", method = RequestMethod.POST)
+	public Result deleteOrderImg(String fileName,String orderNo,String sign){
+		Result res = new Result();
+		if (StringUtils.isBlank(orderNo)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"订单编号","订单编号"));
+			return  res;
+		}
+		if (!sign.equals(OrderImgEnums.CONTRACT.getCode())&&
+				!sign.equals(OrderImgEnums.SUPPLEMENT.getCode())&&
+				!sign.equals(OrderImgEnums.CONTENT.getCode())){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"sign","sign"));
+			return  res;
+		}
+		deleteFile(res,fileName);
+		res.setData(orderServiceImpl.deleteOrderImg(fileName,orderNo,sign));
 		return res;
 	}
 
+
+
 	/** 查询公共订单 **/
 	@RequestMapping(value = "/listPublicOrder", method = RequestMethod.POST)
 	public Result listPublicOrder(OrderListBo bo,String startDate,String endDate,Integer pageNo, Integer pageSize){
@@ -375,21 +188,7 @@ public class AdminOrderApiController extends CertifyApiController {
 		return res;
 	}
 
-	/** 分配订单到营销员 **/
-	@RequestMapping(value = "/appointSalesman", method = RequestMethod.GET)
-	public Result appointSalesman(String orderNo,String salesmanId){
-		Result res = new Result();
-		if(StringUtils.isBlank(orderNo)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
-			return res;
-		}
-		if(StringUtils.isBlank(salesmanId)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","指定人员编号"));
-			return res;
-		}
-		orderServiceImpl.updateAppointSalesman(orderNo, salesmanId);
-		return res;
-	}
+
 
 	/** 我的结算查询 **/
 	@RequestMapping(value = "/listMySettlement", method = RequestMethod.POST)
@@ -444,51 +243,7 @@ public class AdminOrderApiController extends CertifyApiController {
 		return res;
 	}
 
-	/** 查询流水详情 **/
-	@RequestMapping(value = "/selectBillDetail", method = RequestMethod.GET)
-	public Result selectBillDetail(String billNo){
-		Result res = new Result();
-		if(StringUtils.isBlank(billNo)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","流水编号"));
-			return res;
-		}
-		res.setData(orderServiceImpl.selectBillDetail(billNo));
-		return res;
-	}
 
-	/**
-	 * 订单流水确认
-	 * @param billNo
-	 * @param orderNo
-	 * @param confirm
-	 * @param financialPayNo
-	 * @param financialPayTime
-	 * @param remarks
-	 * @return
-	 */
-	@RequestMapping(value = "/confrimBill", method = RequestMethod.POST)
-	public Result confrimBill(String billNo,String orderNo,Integer confirm,String financialPayNo,String financialPayTime,String remarks){
-		Result res = new Result();
-		if(StringUtils.isBlank(billNo)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","流水编号"));
-			return res;
-		}
-		if(StringUtils.isBlank(orderNo)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
-			return res;
-		}
-		if(null == confirm){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","确认状态"));
-			return res;
-		}else if(confirm  == AuditState.AUDIT_SUCCESS.getCode()){
-			if(StringUtils.isBlank(financialPayTime)){
-				res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","财务流水时间"));
-				return res;
-			}
-		}
-		orderServiceImpl.updateBill(billNo,orderNo,confirm,financialPayNo,financialPayTime,remarks);
-		return res;
-	}
 
 	/**
 	 * 修改流水
@@ -513,152 +268,9 @@ public class AdminOrderApiController extends CertifyApiController {
 		return res;
 	}
 
-	/**
-	 * 订单支付(测试用)
-	 * @return
-	 */
-	@RequestMapping(value = "/testPay",method = RequestMethod.POST)
-	public Result testPay(String orderNo,String payAmount){
-		Result res = new Result();
-		if(StringUtils.isBlank(orderNo) || StringUtils.isBlank(payAmount)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号和支付金额"));
-			return res;
-		}
-		orderServiceImpl.updatePayForTest(orderNo, payAmount);
-		return res;
-	}
-
-	/**
-	 * 订单退款(测试用)
-	 * @param orderNo
-	 * @param refundAmount
-	 * @return
-	 */
-	@RequestMapping(value = "/testRefund",method = RequestMethod.POST)
-	public Result testRefund(String orderNo,String refundAmount){
-		Result res = new Result();
-		if(StringUtils.isBlank(orderNo) || StringUtils.isBlank(refundAmount)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号和退款金额"));
-			return res;
-		}
-		orderServiceImpl.updateRefundForTest(orderNo, refundAmount);
-		return res;
-	}
-
-	/**
-	 * 派单
-	 * @param orderNo
-	 * @param financeId
-	 * @return
-	 */
-	@RequestMapping(value = "/distributionOrder",method = RequestMethod.POST)
-	public Result distributionOrder(String orderNo,String financeId){
-		Result res = new Result();
-		if(StringUtils.isBlank(orderNo) || StringUtils.isBlank(financeId)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号和指定负责人"));
-			return res;
-		}
-		orderServiceImpl.updateDistributionOrder(orderNo,financeId);
-		return res;
-	}
-
-	/**
-	 * 解锁、锁定、作废
-	 * @param operatorType
-	 * @param orderNo
-	 * @return
-	 */
-	@RequestMapping(value = "/lockOrRevokeOrder",method = RequestMethod.GET)
-	public Result lockOrRevokeOrder(String orderNo,Integer operatorType){
-		Result res = new Result();
-		if(StringUtils.isBlank(orderNo) || operatorType == null){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号和操作类型"));
-			return res;
-		}
-		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;
-	}
 
-	/**
-	 * 确认退款
-	 * @param orderNo
-	 * @param confirm
-	 * @return
-	 */
-	@RequestMapping(value = "/confirmRefund", method = RequestMethod.GET)
-	public Result confirmRefund(String orderNo,boolean confirm){
-		Result res = new Result();
-		if(StringUtils.isBlank(orderNo)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
-			return res;
-		}
-		orderServiceImpl.updateConfirmRefund(orderNo,confirm);
-		return res;
-	}
 
-	/**
-	 * 转交订单
-	 * @param orderNo
-	 * @param aid
-	 * @param targetType
-	 * @return
-	 */
-	@RequestMapping(value = "/transferOrder", method = RequestMethod.POST)
-	public Result transferOrder(String orderNo,String aid,Integer targetType){
-		Result res = new Result();
-		if(StringUtils.isBlank(orderNo)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
-			return res;
-		}
-		if(StringUtils.isBlank(aid)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","转交人 ID"));
-			return res;
-		}
-		if(null == targetType){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","转交类型"));
-			return res;
-		}
-		orderServiceImpl.updateTransferOrder(orderNo, aid, targetType);
-		return res;
-	}
 
-	/**
-	 * 发起订单变更(作废)
-	 * @param orderNo
-	 * @param changeComment
-	 * @return
-	 */
-	@RequestMapping(value = "/addOrderChange",method = RequestMethod.POST)
-	public Result addOrderChange(String orderNo,String changeComment,String taskList,String dunList){
-		Result res = new Result();
-		//此订单变更为原订单变更已经确定不再使用。
-		if(StringUtils.isBlank(orderNo)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
-			return res;
-		}
-		if(StringUtils.isBlank(changeComment)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","变更说明"));
-			return res;
-		}
-		orderServiceImpl.addOrderChange(orderNo,changeComment,taskList,dunList);
-		return res;
-	}
 
 	/**
 	 * 查看变更记录
@@ -676,42 +288,8 @@ public class AdminOrderApiController extends CertifyApiController {
 		return res;
 	}
 
-	/**
-	 * 删除变更
-	 * @param changeId
-	 * @return
-	 */
-	@RequestMapping(value = "/deleteOrderChange",method = RequestMethod.GET)
-	public Result deleteOrderChange(String changeId){
-		Result res = new Result();
-		if(StringUtils.isBlank(changeId)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","变更ID"));
-			return res;
-		}
-		orderServiceImpl.deleteOrderChange(changeId);
-		return res;
-	}
 
-	/**
-	 * 更新变更记录
-	 * @param changeComment
-	 * @param changeStatus
-	 * @return
-	 */
-	@RequestMapping(value = "/updateOrderChange",method = RequestMethod.POST)
-	public Result updateOrderChange(String changeId,String changeComment,Integer changeStatus){
-		Result res = new Result();
-		if(StringUtils.isBlank(changeId)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","变更ID"));
-			return res;
-		}
-		if(changeStatus == null){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","变更状态"));
-			return res;
-		}
-		orderServiceImpl.updateOrderChange(changeId,changeComment,changeStatus);
-		return res;
-	}
+
 
 	/**
 	 * 修复订单数据

+ 47 - 0
src/main/java/com/goafanti/order/enums/OrderImgEnums.java

@@ -0,0 +1,47 @@
+package com.goafanti.order.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum OrderImgEnums {
+    /** 合同图片*/
+    CONTRACT("contract","合同图片"),
+    /** 补充协议*/
+    SUPPLEMENT("supplement","补充协议"),
+    /** 服务内容*/
+    CONTENT("content","服务内容");
+
+    private OrderImgEnums(String code, String desc){
+        this.code=code;
+        this.desc=desc;
+    }
+
+    private static Map<String ,OrderImgEnums> status= new HashMap<>();
+
+    private String code;
+    private String desc;
+
+    public static Map<String, OrderImgEnums> getStatus() {
+        return status;
+    }
+
+    public static void setStatus(Map<String, OrderImgEnums> status) {
+        OrderImgEnums.status = status;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+}

+ 19 - 268
src/main/java/com/goafanti/order/service/OrderService.java

@@ -18,66 +18,16 @@ import com.goafanti.order.bo.OrderChangeBo;
 
 public interface OrderService {
 
-	/**
-	 * 查询商品详情
-	 * @param commodityId 商品id
-	 * @param orderType 订单类型
-	 * @return
-	 */
-	C2COrderDetailBo selectCommodityDetail(String commodityId,Integer orderType);
 
-	/**
-	 * 添加意向
-	 * @param orderNo 订单编号
-	 * @param commodityId 商品id
-	 * @param commodityMode 商品型号
-	 * @param commodityQuantity 商品数量
-	 * @param commodityType 商品类型
-	 * @param createTime 创建时间
-	 * @param remarks 备注
-	 * @return
-	 */
-	int addIntention(String orderNo, String commodityId, String commodityMode, Integer commodityQuantity,Integer commodityType,
-			String createTime, String remarks) throws ParseException ;
 
-	/**
-	 * 支付定金
-	 * @param orderNo 订单编号
-	 * @param fundAmount 金额
-	 * @return remarks 备注
-	 */
-	int updatePayForFirst(String orderNo, BigDecimal fundAmount,String remarks);
 
-	/**
-	 * 退款操作
-	 * @param orderNo
-	 * @param refundAmount
-	 * @return
-	 */
-	int updateRefundForTest(String orderNo, String refundAmount);
 
-	/**
-	 * 支付尾款
-	 * @param orderNo 订单编号
-	 * @param fundAmount 金额
-	 * @param remarks 备注
-	 * @return
-	 */
-	int updatePayForLast(String orderNo, BigDecimal fundAmount, String remarks);
 
-	/**
-	 *
-	 * @param confirm 是否
-	 * @return
-	 */
-	Pagination<C2BOrderDetailBo> selectOrderList(boolean confirm,Integer pageNo,Integer PageSize);
 
-	/**
-	 * 查询订单详情
-	 * @param orderNo
-	 * @return
-	 */
-	C2BOrderDetailBo selectOrderDetail(String orderNo);
+
+
+
+
 
 	/**
 	 * 用户查询流水记录
@@ -86,27 +36,10 @@ public interface OrderService {
 	 */
 	Pagination<BillListBo> selectOrderBillList(String orderNo,Integer pageNo,Integer pageSize);
 
-	/**
-	 * 提现
-	 * @param orderNo
-	 * @return
-	 */
-	int updateApplyForWithdraw(String orderNo,String remarks);
 
-	/**
-	 * 取消订单
-	 * @param orderNo
-	 * @return
-	 */
-	int updateApplyForCancel(String orderNo);
 
-	/**
-	 * 确认意向订单
-	 * @param orderNo 订单编号
-	 * @param confirm 是否确认
-	 * @return
-	 */
-	int updateConfirmIntention(String orderNo, boolean confirm);
+
+
 
 	/**
 	 *
@@ -124,73 +57,12 @@ public interface OrderService {
 
 
 
-	/**
-	 * 服务订单详情
-	 * @param orderNo
-	 * @return
-	 */
-	ServiceOrderDetailBo selectServiceOrderDetail(String orderNo);
 
-	/**
-	 * 更新订单
-	 * @param orderNo
-	 * @param signFirstPayment
-	 * @param signTotalAmount
-	 * @param orderRemarks
-	 * @return
-	 */
-	int updateServiceOrder(String orderNo, String signFirstPayment,
-			String signTotalAmount, String contractNo,String orderRemarks,String contractPictureUrl);
 
-	/**
-	 * 签单
-	 * @param orderNo
-	 * @param signFirstPayment
-	 * @param signTotalAmount
-	 * @param approval
-	 * @param orderRemarks
-	 * @return
-	 */
-	int updateSignServiceOrder(String orderNo,String contractNo,String signFirstPayment, String signTotalAmount,
-			String approval,String orderRemarks,String signTime);
 
-	/**
-	 * 作废订单
-	 * @param orderNo
-	 * @return
-	 */
-	int updateRevokeOrder(String orderNo);
 
-	/**
-	 * 添加订单商品
-	 * @param orderNo
-	 * @param commodityId
-	 * @param commodityMode
-	 * @param commodityQuantity
-	 * @param commodityType
-	 * @param discountPrice
-	 * @param remarks
-	 * @return
-	 */
-	int addOrderCommodity(String orderNo, String commodityId, String commodityName,String commodityMode, Integer commodityQuantity,Integer commodityType,
-			String commodityPrice, String discountPrice,String commodityFirstPayment,String discountFirstPayment, String remarks);
 
-	/**
-	 * 修改商品信息
-	 * @param detailId
-	 * @param discountPrice
-	 * @param discountFirstPayment
-	 * @param remarks
-	 * @return
-	 */
-	int updateOrderCommodity(String detailId,String discountPrice,String discountFirstPayment,Integer commodityQuantity,String remarks);
 
-	/**
-	 * 删除订单商品
-	 * @param detailId
-	 * @return
-	 */
-	int deleteOrderCommodity(String detailId);
 
 	/**
 	 * 查询分管部门、查询管理部门
@@ -206,7 +78,6 @@ public interface OrderService {
 	 * @param intention 是否包含意向
 	 * @param formal 是否包含正式
 	 * @param depIds 部门id
-	 * @param history 是否包含历史
 	 * @param pageNo
 	 * @param pageSize
 	 * @return
@@ -220,7 +91,6 @@ public interface OrderService {
 	 * @param startDate 开始时间
 	 * @param endDate 结束时间
 	 * @param depIds 部门id
-	 * @param history 是否包含历史
 	 * @param pageNo
 	 * @param pageSize
 	 * @return
@@ -236,20 +106,13 @@ public interface OrderService {
 	 */
 	Pagination<OrderListBo> selectPublicOrder(OrderListBo bo,String startDate,String endDate,Integer pageNo, Integer pageSize);
 
-	/**
-	 * 指定的营销员
-	 * @param orderNo
-	 * @param salesmanId
-	 * @return
-	 */
-	int updateAppointSalesman(String orderNo,String salesmanId);
+
 
 	/**
 	 *
 	 * @param orderNo
 	 * @param depId
 	 * @param buyerName
-	 * @param salesmanId
 	 * @param salesmanName
 	 * @param financeName
 	 * @param pageNo
@@ -304,44 +167,22 @@ public interface OrderService {
 	Pagination<BillListBo> queryAllBillList(String payeeName,String payerName,String depId,String salesmanName,String financeName,String orderNo,
 			 Integer confirmSign,Integer deleteSign,Integer pageNo,Integer pageSize);
 
-	/**
-	 * 查看流水详情
-	 * @param billNo
-	 * @return
-	 */
-	BillDetailBo selectBillDetail(String billNo);
 
-	/**
-	 * 确认流水订单
-	 * @param billNo
-	 * @param orderNo
-	 * @param confrim
-	 * @return
-	 */
-	int updateBill(String billNo, String orderNo, Integer confrim,String financialPayNo,String financialPayTime,String remarks);
+
+
 
 
 	/**
 	 * 修改露水订单
 	 * @param billNo
 	 * @param orderNo
-	 * @param confrim
 	 * @return
 	 */
 	int updateBill(String billNo,String orderNo,String financialPayNo,String financialPayTime,String remarks);
 
-	/**
-	 * 特批订单
-	 * @param orderNo
-	 * @param confirm
-	 * @return
-	 */
-	int updateApprovalServiceOrder(String orderNo, Integer confirm);
+
 	/**
 	 * 查询待立项订单
-	 * @param bo
-	 * @param startDate
-	 * @param endDate
 	 * @param depId
 	 * @param pageNo
 	 * @param pageSize
@@ -350,99 +191,21 @@ public interface OrderService {
 	Pagination<OrderListBo> listSetUpServiceOrder(String buyerName,String salesmanName, String financeName,
 			String depId,Integer approval, Integer pageNo, Integer pageSize);
 
-	/**
-	 * 项目立项
-	 * @param orderNo
-	 * @param signDate
-	 * @param signComment
-	 * @return
-	 */
-	int updateSetUpProject(String orderNo, String signComment);
 
-	/**
-	 * 订单编号
-	 * @param orderNo
-	 * @return
-	 */
-	List<TOrderDetail> selectOrderCommodity(String orderNo);
 
-	/**
-	 * 支付(测试用)
-	 * @param orderNo
-	 * @param payAmount
-	 * @return
-	 */
-	int updatePayForTest(String orderNo,String payAmount);
 
-	/**
-	 * 分配订单
-	 * @param orderNo
-	 * @param financeId
-	 * @return
-	 */
-	int updateDistributionOrder(String orderNo, String financeId);
 
-	/**
-	 * 锁定、解锁、废除
-	 * @param orderNo
-	 * @param operatorType
-	 * @return
-	 */
-	int updateLockOrRevokeOrder(String orderNo, Integer operatorType);
 
-	/**
-	 * 查询单笔订单流水
-	 * @param orderNo
-	 * @return
-	 */
-	List<BillListBo> selectBillByOrderNo(String orderNo);
 
-	/**
-	 * 申请退款(买家)
-	 * @param orderNo
-	 * @return
-	 */
-	int updateApplyForRefund(String orderNo);
 
-	/**
-	 * 确认退款(买家)
-	 * @param orderNo
-	 * @return
-	 */
-	int updateConfirmRefund(String orderNo,boolean confirm);
 
-	/**
-	 * 转交订单
-	 * @param orderNo
-	 * @param aid
-	 * @param targetType
-	 * @return
-	 */
-	int updateTransferOrder(String orderNo,String aid,Integer targetType);
 
-	/**
-	 * PC端添加意向
-	 * @param orderNo 订单编号
-	 * @param commodityId 商品id
-	 * @param commodityMode 商品型号
-	 * @param commodityQuantity 商品数量
-	 * @param commodityType 商品类型
-	 * @param createTime 创建时间
-	 * @param remarks 备注
-	 * @return
-	 */
-	int addPurpose(String orderNo, String commodityId, String commodityMode, Integer commodityQuantity,Integer commodityType,
-			String createTime,String remarks) throws ParseException;
 
-	/**
-	 * 添加变更记录
-	 * @param orderNo
-	 * @param changeComment
-	 * @param dunList
-	 * @param taskList
-	 * @return
-	 */
-	int addOrderChange(String orderNo, String changeComment, String taskList, String dunList);
+
+
+
+
+
 
 	/**
 	 * 查看变更记录列表
@@ -451,21 +214,9 @@ public interface OrderService {
 	 */
 	List<OrderChangeBo> selectOrderChange(String orderNo);
 
-	/**
-	 * 删除变更记录
-	 * @param changeId
-	 * @return
-	 */
-	int deleteOrderChange(String changeId);
 
-	/**
-	 * 修改变更记录
-	 * @param changeId
-	 * @param changeComment
-	 * @param changeStatus
-	 * @return
-	 */
-	int updateOrderChange(String changeId, String changeComment, Integer changeStatus);
+
+
 
 	/**
 	 * 修复订单数据
@@ -475,11 +226,11 @@ public interface OrderService {
 
 	void addContractTaskLog();
 
-	boolean checkCustomerInformation(String uid);
 
 	int addBusinessProjectId(FollowBusinessBo fbb);
 
 
+    int pushOrderImg(String orderNo, String imageUrl,String sign);
 
-
+    int deleteOrderImg(String fileName,String orderNo, String sign);
 }

File diff suppressed because it is too large
+ 102 - 977
src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java


+ 15 - 34
src/main/java/com/goafanti/portal/controller/PortalServicesController.java

@@ -32,11 +32,11 @@ public class PortalServicesController extends BaseController {
 	BusinessVarietiesService	businessVarietiesService;
 	@Resource
 	OrderService	orderService;
-	
-	
-	
-	
-	
+
+
+
+
+
 	/**
 	 * 推荐列表
 	 */
@@ -46,7 +46,7 @@ public class PortalServicesController extends BaseController {
 		res.setData(businessProjectService.portalRecommendList( pNo, pSize));
 		return res;
 	}
-	
+
 	/**
 	 * 一对一
 	 */
@@ -56,7 +56,7 @@ public class PortalServicesController extends BaseController {
 		res.setData(userIdentityService.portalConsultantList( pNo, pSize));
 		return res;
 	}
-	
+
 	/**
 	 * 获取初级品类
 	 */
@@ -66,7 +66,7 @@ public class PortalServicesController extends BaseController {
 		res.setData(businessVarietiesService.portalVarieties());
 		return res;
 	}
-	
+
 	/**
 	 * 获取品类下的项目
 	 */
@@ -106,30 +106,11 @@ public class PortalServicesController extends BaseController {
 		res.setData(businessVarietiesService.saveInterest( uid, objectId,interest));
 		return res;
 	}
-	
-	/**
-	 * 添加意向
-	 * @param orderNo 订单编号
-	 * @param commodityId 商品id
-	 * @param commodityMode 商品型号
-	 * @param commodityQuantity 商品数量
-	 * @param commodityType 商品类型
-	 * @param createTime 创建时间
-	 * @param remarks 备注
-	 * @return
-	 * @throws ParseException 
-	 */
-	@RequestMapping(value = "/addPurpose", method = RequestMethod.GET)
-	public Result addPurpose(String orderNo, String commodityId, String commodityMode, Integer commodityQuantity,Integer commodityType, 
-			String createTime,String remarks) throws ParseException {
-		Result res = new Result();
-		res.setData(orderService.addPurpose( orderNo,  commodityId,  commodityMode,  commodityQuantity, commodityType, 
-				 createTime, remarks));
-		return res;
-	}
-	
-	
-	
-	
-	
+
+
+
+
+
+
+
 }

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

@@ -71,11 +71,11 @@ public class AdminTechProjectApiController extends CertifyApiController {
 	private AdminService			adminService;
 	@Resource
 	private OrderService orderServiceImpl;
-	
+
 
 	/**
 	 * 科技网址申报公司下拉
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/websiteUnit", method = RequestMethod.GET)
@@ -92,7 +92,7 @@ public class AdminTechProjectApiController extends CertifyApiController {
 
 	/**
 	 * 咨询师下拉列表
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/getConsultant", method = RequestMethod.GET)
@@ -109,7 +109,7 @@ public class AdminTechProjectApiController extends CertifyApiController {
 
 	/**
 	 * 负责人下拉
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/getPrincipal", method = RequestMethod.GET)
@@ -126,7 +126,7 @@ public class AdminTechProjectApiController extends CertifyApiController {
 
 	/**
 	 * 科技项目申报列表
-	 * 
+	 *
 	 * @param pageNo
 	 * @param pageSize
 	 * @return
@@ -164,7 +164,7 @@ public class AdminTechProjectApiController extends CertifyApiController {
 
 	/**
 	 * 科技项目申报
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/applyTechProject", method = RequestMethod.POST)
@@ -199,7 +199,7 @@ public class AdminTechProjectApiController extends CertifyApiController {
 
 	/**
 	 * 科技项目申报详情
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/techProjectDetial", method = RequestMethod.POST)
@@ -215,7 +215,7 @@ public class AdminTechProjectApiController extends CertifyApiController {
 
 	/**
 	 * 科技项目状态流转
-	 * 
+	 *
 	 * @param pid
 	 * @return
 	 */
@@ -232,9 +232,7 @@ public class AdminTechProjectApiController extends CertifyApiController {
 
 	/**
 	 * update科技项目
-	 * 
-	 * @param t
-	 * @param l
+	 *
 	 * @param recordTimeFormattedDate
 	 * @return
 	 * @throws ParseException
@@ -288,7 +286,7 @@ public class AdminTechProjectApiController extends CertifyApiController {
 
 	/**
 	 * 流转状态下拉
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/status", method = RequestMethod.GET)
@@ -300,7 +298,7 @@ public class AdminTechProjectApiController extends CertifyApiController {
 
 	/**
 	 * 获取科技部门
-	 * 
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/getDepartment", method = RequestMethod.GET)
@@ -312,7 +310,7 @@ public class AdminTechProjectApiController extends CertifyApiController {
 
 	/**
 	 * 删除科技项目记录
-	 * 
+	 *
 	 * @param ids
 	 * @return
 	 */
@@ -329,7 +327,7 @@ public class AdminTechProjectApiController extends CertifyApiController {
 
 	/**
 	 * 删除科技网址记录
-	 * 
+	 *
 	 * @param ids
 	 * @return
 	 */
@@ -379,8 +377,7 @@ public class AdminTechProjectApiController extends CertifyApiController {
 
 	/**
 	 * 网址管理详情
-	 * 
-	 * @param wid
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/techWebsiteDetail", method = RequestMethod.POST)
@@ -408,8 +405,7 @@ public class AdminTechProjectApiController extends CertifyApiController {
 
 	/**
 	 * 科技单位网址add+update
-	 * 
-	 * @param t
+	 *
 	 * @return
 	 */
 	@RequestMapping(value = "/disposeTechWebsite", method = RequestMethod.POST)
@@ -447,7 +443,7 @@ public class AdminTechProjectApiController extends CertifyApiController {
 
 	/**
 	 * 科技项目申报材料上传
-	 * 
+	 *
 	 * @param req
 	 * @param uid
 	 * @return
@@ -494,10 +490,8 @@ public class AdminTechProjectApiController extends CertifyApiController {
 
 	/**
 	 * 下载科技项目材料
-	 * 
+	 *
 	 * @param response
-	 * @param fileName
-	 * @param path
 	 * @param id
 	 * @return
 	 */
@@ -561,7 +555,7 @@ public class AdminTechProjectApiController extends CertifyApiController {
 		}
 		return status;
 	}
-	
+
 	/** 查询立项订单 **/
 	@RequestMapping(value = "/listSetUpServiceOrder", method = RequestMethod.POST)
 	public Result listSetUpServiceOrder(String buyerName,String salesmanName, String financeName,
@@ -570,25 +564,13 @@ public class AdminTechProjectApiController extends CertifyApiController {
 		res.setData(orderServiceImpl.listSetUpServiceOrder(buyerName, salesmanName, financeName, depId, approval, pageNo, pageSize));
 		return res;
 	}
-	
-	/** 项目立项 **/
-	@RequestMapping(value = "/setUpProject", method = RequestMethod.GET)
-	public Result setUpProject(String orderNo,String signComment){
-		Result res = new Result();
-		if(StringUtils.isBlank(orderNo)){
-			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "订单编号"));
-			return res;
-		}
-		orderServiceImpl.updateSetUpProject(orderNo,signComment);
-		return res;
-	}
-	
+
+
+
 	/**
 	 * 项目列表
 	 * @param bo
 	 * @param depId
-	 * @param orderStartTime
-	 * @param orderEndTime
 	 * @param setUpStartDate
 	 * @param setUpEndDate
 	 * @return
@@ -600,13 +582,11 @@ public class AdminTechProjectApiController extends CertifyApiController {
 		res.setData(techProjectService.listProject(bo, depId, orderStartDate, orderEndDate, setUpStartDate, setUpEndDate,pageNo,pageSize));
 		return res;
 	}
-	
+
 	/**
 	 * 创建项目
-	 * @param orderNo
 	 * @param uid
 	 * @param aid
-	 * @param projectType
 	 * @param signComment
 	 * @return
 	 */
@@ -616,11 +596,11 @@ public class AdminTechProjectApiController extends CertifyApiController {
 		if(StringUtils.isBlank(uid) || StringUtils.isBlank(aid) || contractType == null){
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "客户和项目负责人"));
 			return res;
-		} 
+		}
 		techProjectService.createProject(uid, aid, signComment,contractType);
 		return res;
 	}
-	
+
 	/**
 	 * 查询项目详情
 	 * @param contractId
@@ -640,7 +620,7 @@ public class AdminTechProjectApiController extends CertifyApiController {
 		res.setData(techProjectService.selectTechProjectDetail(contractId,buyerType));
 		return res;
 	}
-	
+
 	/**
 	 * 查看项目任务
 	 * @param contractId
@@ -656,7 +636,7 @@ public class AdminTechProjectApiController extends CertifyApiController {
 		res.setData(techProjectService.selectProjectTask(contractId));
 		return res;
 	}
-	
+
 	/**
 	 * 添加项目任务
 	 * @param commodityId
@@ -675,7 +655,7 @@ public class AdminTechProjectApiController extends CertifyApiController {
 		techProjectService.addProjectTask(contractId,commodityId,commodityName,commodityQuantity,commodityMode,taskComment);
 		return res;
 	}
-	
+
 	/**
 	 * 删除任务
 	 * @param taskId
@@ -691,7 +671,7 @@ public class AdminTechProjectApiController extends CertifyApiController {
 		techProjectService.deleteProjectTask(taskId);
 		return res;
 	}
-	
+
 	/**
 	 * 查询任务详情
 	 * @param taskId
@@ -707,7 +687,7 @@ public class AdminTechProjectApiController extends CertifyApiController {
 		res.setData(techProjectService.selectProjectTaskDetail(taskId));
 		return res;
 	}
-	
+
 	/**
 	 * 修改项目任务
 	 * @param taskId
@@ -734,11 +714,10 @@ public class AdminTechProjectApiController extends CertifyApiController {
 		techProjectService.updateProjectTask(task);
 		return res;
 	}
-	
+
 	/**
 	 * 派单
 	 * @param taskId
-	 * @param taskReceiver
 	 * @return
 	 */
 	@RequestMapping(value = "/distributionTask",method = RequestMethod.POST)
@@ -751,9 +730,9 @@ public class AdminTechProjectApiController extends CertifyApiController {
 		techProjectService.updateDistributionTask(taskId,taskReceiverId);
 		return res;
 	}
-	
+
 	/**
-	 * 
+	 *
 	 * @param projectNo 项目编号
 	 * @param buyerName 客户名称
 	 * @param startDate 开始时间
@@ -766,34 +745,34 @@ public class AdminTechProjectApiController extends CertifyApiController {
 	public Result listMyTask(String projectNo,String buyerName,String startDate,String endDate,String publishStatus, Integer taskStatus,String categoryId,
 			Integer pageNo, Integer pageSize){
 		Result res = new Result();
-		res.setData(techProjectService.selectMyProjectTask(projectNo, buyerName, TokenManager.getAdminId(), "", 
+		res.setData(techProjectService.selectMyProjectTask(projectNo, buyerName, TokenManager.getAdminId(), "",
 				startDate, endDate, taskStatus, categoryId,null,publishStatus, pageNo, pageSize));
 		return res;
 	}
-	
+
 	/**
 	 * 	项目任务查询
 	 * @param projectNo 项目编号
-	 * @param buyerName 客户名称 
+	 * @param buyerName 客户名称
 	 * @param taskReceiverName 任务负责人
 	 * @param startDate 开始时间
 	 * @param endDate 结束时间
 	 * @param taskStatus 任务状态
 	 * @param categoryId 任务分类
-	 * @param pageNo 
+	 * @param pageNo
 	 * @param pageSize
 	 * @return
 	 */
 	@RequestMapping(value = "/listTask",method = RequestMethod.POST)
-	public Result listTask(String projectNo,String buyerName,String taskReceiverName, String startDate,String endDate, 
+	public Result listTask(String projectNo,String buyerName,String taskReceiverName, String startDate,String endDate,
 			Integer taskStatus,String categoryId,String deleteSign,String publishStatus, Integer pageNo, Integer pageSize){
 		Result res = new Result();
-		res.setData(techProjectService.selectProjectTask(projectNo, buyerName, "", taskReceiverName, startDate, endDate, 
+		res.setData(techProjectService.selectProjectTask(projectNo, buyerName, "", taskReceiverName, startDate, endDate,
 				taskStatus, categoryId,deleteSign,publishStatus, pageNo, pageSize));
 		return res;
 	}
-	
-	
+
+
 	/**
 	 * 启动资料
 	 * @param taskId
@@ -821,7 +800,7 @@ public class AdminTechProjectApiController extends CertifyApiController {
 		}
 		return res;
 	}
-	
+
 	/**
 	 * 完成任务
 	 * @param taskId
@@ -850,11 +829,10 @@ public class AdminTechProjectApiController extends CertifyApiController {
 		}
 		return res;
 	}
-	
+
 	/**
 	 * 转交任务
 	 * @param taskId
-	 * @param receiverId
 	 * @return
 	 */
 	@RequestMapping(value = "/transferTask", method = RequestMethod.GET)
@@ -870,7 +848,7 @@ public class AdminTechProjectApiController extends CertifyApiController {
 		techProjectService.updateProjectTask(task);
 		return res;
 	}
-	
+
 	/**
 	 * 撤项或结项
 	 * @param contractId
@@ -887,7 +865,7 @@ public class AdminTechProjectApiController extends CertifyApiController {
 		techProjectService.updateRevokeOrComplete(contractId,operatorType,completeComment);
 		return res;
 	}
-	
+
 	/**
 	 * 锁定、解锁、废除任务
 	 * @param taskId
@@ -912,27 +890,9 @@ public class AdminTechProjectApiController extends CertifyApiController {
 		techProjectService.updateProjectTask(task);
 		return res;
 	}
-	
-	/**
-	 * 转交项目
-	 * @param contractId
-	 * @param projectReceiveId
-	 * @return
-	 */
-	@RequestMapping(value = "/transferProject", method = RequestMethod.GET)
-	public Result transferProject(String contractId,String projectReceiveId,String orderNo){
-		Result res = new Result();
-		if(StringUtils.isBlank(contractId) || StringUtils.isBlank(projectReceiveId)){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"", "项目ID和接收人ID"));
-			return res;
-		}
-		techProjectService.updateTransferProject(contractId,projectReceiveId);
-		if(StringUtils.isNotBlank(orderNo)){
-			orderServiceImpl.updateTransferOrder(orderNo, projectReceiveId, 2);
-		}
-		return res;
-	}
-	
+
+
+
 	/**
 	 * 修改项目信息
 	 * @param contractId
@@ -950,13 +910,10 @@ public class AdminTechProjectApiController extends CertifyApiController {
 		techProjectService.updateProjectTask(contractId,signDate,signComment,completeDate,completeComment);
 		return res;
 	}
-	
+
 	/**
 	 * 项目任务公示修改
 	 * @param taskId
-	 * @param commodityId
-	 * @param commodityMode
-	 * @param taskComment
 	 * @return
 	 */
 	@RequestMapping(value = "/updatePublishStatus",method = RequestMethod.POST)
@@ -979,13 +936,11 @@ public class AdminTechProjectApiController extends CertifyApiController {
 		techProjectService.updateProjectTask(task);
 		return res;
 	}
-	
+
 	/**
 	 * 营销员查询项目列表
 	 * @param bo
 	 * @param depId
-	 * @param orderStartTime
-	 * @param orderEndTime
 	 * @param setUpStartDate
 	 * @param setUpEndDate
 	 * @return

+ 6 - 12
src/main/java/com/goafanti/techproject/service/TechProjectService.java

@@ -105,24 +105,24 @@ public interface TechProjectService {
 	 * @return
 	 */
 	int updateProjectTask(ContractTask task);
-	
+
 	/**
 	 * 项目任务列表
-	 * @param projectNo	
+	 * @param projectNo
 	 * @param buyerName
 	 * @param taskReceiver
 	 * @param startDate
 	 * @param endDate
 	 * @param taskStatus
 	 * @param categoryId
-	 * @param deletedSign 
+	 * @param deletedSign
 	 * @param pageNo
 	 * @param pageSize
 	 * @return
 	 */
 	Pagination<TaskListBo> selectProjectTask(String projectNo,String buyerName,String taskReceiverId, String taskReceiverName,
 			String startDate,String endDate, Integer taskStatus,String categoryId,String deleteSign,String publishStatus, Integer pageNo, Integer pageSize);
-	
+
 	/**
 	 * 根据任务id查询任务
 	 * @param taskId
@@ -145,13 +145,7 @@ public interface TechProjectService {
 	 */
 	int updateRevokeOrComplete(String contractId, Integer operatorType,String completeComment);
 
-	/**
-	 * 转交项目
-	 * @param contractId
-	 * @param projectReceiveId
-	 * @return
-	 */
-	int updateTransferProject(String contractId, String projectReceiveId);
+
 
 	/**
 	 * 修改项目信息
@@ -179,5 +173,5 @@ public interface TechProjectService {
 	Pagination<TaskListBo> selectMyProjectTask(String projectNo, String buyerName, String taskReceiverId,
 			String taskReceiverName, String startDate, String endDate, Integer taskStatus, String categoryId,
 			String deleteSign, String publishStatus, Integer pageNo, Integer pageSize);
-	
+
 }

+ 1 - 10
src/main/java/com/goafanti/techproject/service/impl/TechProjectServiceImpl.java

@@ -529,16 +529,7 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 		return 0;
 	}
 
-	@Override
-	public int updateTransferProject(String contractId, String projectReceiveId) {
-		Contract contract = contractMapper.selectByPrimaryKey(contractId);
-		if(contract != null){
-			contract.setPrincipal(projectReceiveId);
-			contract.setUpdateTime(new Date());
-			return contractMapper.updateByPrimaryKeySelective(contract);
-		}
-		return 0;
-	}
+
 
 	@Override
 	public int updateProjectTask(String contractId, String signDate, String signComment, String completeDate,