功能开发（驳回，图片，及其他调整。。。）

krock-api/krock-api-all/src/main/java/com/ydw/yunbuyer/api/pm/api/OfflineSubmitApi.java

@@ -50,6 +50,13 @@ public interface OfflineSubmitApi {
 	public void verify_apply(@RequestParam("offline_apply_id") String offline_apply_id);
 
 	/**
+	 *  驳回
+	 * @param offline_apply_id
+	 */
+	@RequestMapping("/reject")
+	public void reject(@RequestParam("offline_apply_id") String offline_apply_id);
+
+	/**
 	 * 获取
 	 * 
 	 * @param kid

krock-pm/krock-api-pm/src/main/java/com/ydw/yunbuyer/api/pm/api/OfflineSubmitApi.java

@@ -50,6 +50,13 @@ public interface OfflineSubmitApi {
 	public void verify_apply(@RequestParam("offline_apply_id") String offline_apply_id);
 
 	/**
+	 *  驳回
+	 * @param offline_apply_id
+	 */
+	@RequestMapping("/reject")
+	public void reject(@RequestParam("offline_apply_id") String offline_apply_id);
+
+	/**
 	 * 获取
 	 * 
 	 * @param kid

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/action_api/ISubmitController.java

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.tmsps.ne4spring.page.PagePackage;
 
@@ -44,6 +45,11 @@ public class ISubmitController implements OfflineSubmitApi {
 	}
 
 	@Override
+	public void reject(String offline_apply_id) {
+		wxSubmitService.reject(offline_apply_id);
+	}
+
+	@Override
 	public void add(@RequestBody PmOfflineApply pmOfflineApply) {
 		t_pm_offline_apply pmOfflineApplypo = new t_pm_offline_apply();
 		BeanUtils.copyProperties(pmOfflineApply, pmOfflineApplypo);

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/controller/api/PmController.java

@@ -176,6 +176,7 @@ public class PmController extends ProjBaseAction {
 		String kid = pm_item_id;
 		t_pm_item pm_item = pmItemService.get(kid);
 		String bid_opening = pm_item.getBid_opening();
+		result.put("auction_type", pm_item.getAuction_type());
 		result.put("bid_opening", bid_opening);
 		result.put("circusee_num", pm_item.getCircusee_num());
 		if (bid_opening.equals("已结束")) {

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/controller_wxapp/WxPmController.java

@@ -405,9 +405,12 @@ public class WxPmController extends ProjBaseAction {
 				if (price_bidder.compareTo(price) == -1 || price_bidder.compareTo(price) == 0) {
 					super.setTipMsg(false, "出价失败！已有人以当前价格优先出价！", Tip.Type.success);
 				} else {
-					// 如果在关拍前2分钟内有人出价 ，重新设置倒计时 当前系统时间+延时周期
-					if (pm_item.getTime_end() - System.currentTimeMillis() <= TimeEnum.THREE_MINUTES.getTime() ) {
+					// 如果在关拍前3分钟内有人出价 ，重新设置倒计时 当前系统时间+延时周期
+					if ("1".equals(pm_item.getAuction_type()) || pm_item.getTime_end() - System.currentTimeMillis() <= TimeEnum.THREE_MINUTES.getTime()) {
 						long new_time_end = System.currentTimeMillis() + pm_item.getUpdate_interval() * 1000;
+						if("1".equals(pm_item.getAuction_type())){
+							pm_item.setArchive_status("1");
+						}
 						pmItemService.update_time_end(pm_item, new_time_end);
 						result.put("new_time_end", new_time_end);
 					}
@@ -419,8 +422,11 @@ public class WxPmController extends ProjBaseAction {
 				if (price_bidder.compareTo(price_start) == -1) {
 					super.setTipMsg(true, "出价不允许低于起拍价!", Tip.Type.success);
 				} else {
-					if (pm_item.getTime_end() - System.currentTimeMillis() <= TimeEnum.THREE_MINUTES.getTime()) {
+					if ("1".equals(pm_item.getAuction_type()) || pm_item.getTime_end() - System.currentTimeMillis() <= TimeEnum.THREE_MINUTES.getTime()) {
 						long new_time_end = System.currentTimeMillis() + pm_item.getUpdate_interval() * 1000;
+						if("1".equals(pm_item.getAuction_type())){
+							pm_item.setArchive_status("1");
+						}
 						pmItemService.update_time_end(pm_item, new_time_end);
 						result.put("new_time_end", new_time_end);
 					}

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/controller_wxapp/WxSubmitController.java

@@ -2,6 +2,7 @@ package com.ydw.yunbuyer.web.pm.controller_wxapp;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -36,6 +37,11 @@ public class WxSubmitController extends ProjBaseAction {
 		JSONObject json = sessionWxService.getCurrentLoginPersion();
 		String persion_id = json.getString("kid");
 		pm_offline_apply.setPm_user_id(persion_id);
+		//判断是否已经存在 存在则更新
+		/*t_pm_offline_apply tPmOfflineApply = wxSubmitService.findByUserAndItemId(pm_offline_apply.getPm_item_id(),pm_offline_apply.getPm_user_id());
+		if (tPmOfflineApply != null && !StringUtils.isEmpty(tPmOfflineApply.getKid())){
+			pm_offline_apply.setKid(tPmOfflineApply.getKid());
+		}*/
 		wxSubmitService.offline_apply(pm_offline_apply);
 		super.setTipMsg(true, "报名成功", Tip.Type.success);
 		return result.toJSONString();

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/dao/WxSubmitDao.java

@@ -39,6 +39,13 @@ public interface WxSubmitDao extends BaseDao<t_pm_offline_apply>{
 	 * @return
 	 */
 	public void verify_apply(String offline_apply_id);
+
+	/**
+	 * 驳回
+	 *
+	 * @return
+	 */
+	public void reject(String offline_apply_id);
 	
 	/**
 	 * 	线下报名绑定竞拍号

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/entity/t_pm_item.java

@@ -18,7 +18,7 @@ import com.ydw.yunbuyer.common.utils.date.CreatedTools;
 @Table
 public class t_pm_item extends DataModel {
 
-	private String auction_type;
+	private String auction_type; //线上 or 线下 0线上  1线下
 	private String item_name; // 标段名称
 	private String bid_status;
 	private String project_item_id; // 标段id

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/entity/t_pm_offline_apply.java

@@ -24,7 +24,8 @@ public class t_pm_offline_apply extends DataModel {
 	private String receive_name;
 	private String id_card;
 	private String company_name;
-	private int is_pay;//0未支付1支付
+	private int is_pay;//0未支付1支付2已驳回
+	private String file_id; // 支付凭证图片id
 	// ========== 系统字段 ========================
 	@PK
 	private String kid;
@@ -119,4 +120,11 @@ public class t_pm_offline_apply extends DataModel {
 		this.company_name = company_name;
 	}
 
+	public String getFile_id() {
+		return file_id;
+	}
+
+	public void setFile_id(String file_id) {
+		this.file_id = file_id;
+	}
 }

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/service/WxSubmitService.java

@@ -37,6 +37,8 @@ public interface WxSubmitService extends BaseService<t_pm_offline_apply> {
 
 	public void verify_apply(String offline_apply_id);
 
+	public void reject(String offline_apply_id);
+
 	public void offline_apply_bind_code(String offline_apply_id, String pm_item_id, String offline_code);
 	
 	public void online_edit_code(String pm_user_id, String pm_item_id, String code);

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/serviceImpl/WxSubmitServiceImpl.java

@@ -44,7 +44,12 @@ public class WxSubmitServiceImpl extends BaseServiceImpl<t_pm_offline_apply> imp
 	public void verify_apply(String offline_apply_id) {
 		wxSubmitDao.verify_apply(offline_apply_id);
 	}
-	
+
+	@Override
+	public void reject(String offline_apply_id) {
+		wxSubmitDao.reject(offline_apply_id);
+	}
+
 	@Override
 	public void offline_apply_bind_code(String offline_apply_id,String pm_item_id,String offline_code) {
 		wxSubmitDao.offline_apply_bind_code(offline_apply_id,pm_item_id,offline_code);

krock-pm/krock-web-pm/src/main/resources/sql/数据库修改语句.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `krock-service-pm`.`t_pm_offline_apply`
+ADD COLUMN `file_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' AFTER `company_name`;