Selaa lähdekoodia

功能开发(驳回,图片,及其他调整。。。)

ytf 3 vuotta sitten
vanhempi
commit
10af83047b

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

@@ -50,6 +50,13 @@ public interface OfflineSubmitApi {
50
 	public void verify_apply(@RequestParam("offline_apply_id") String offline_apply_id);
50
 	public void verify_apply(@RequestParam("offline_apply_id") String offline_apply_id);
51
 
51
 
52
 	/**
52
 	/**
53
+	 *  驳回
54
+	 * @param offline_apply_id
55
+	 */
56
+	@RequestMapping("/reject")
57
+	public void reject(@RequestParam("offline_apply_id") String offline_apply_id);
58
+
59
+	/**
53
 	 * 获取
60
 	 * 获取
54
 	 * 
61
 	 * 
55
 	 * @param kid
62
 	 * @param kid

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

@@ -50,6 +50,13 @@ public interface OfflineSubmitApi {
50
 	public void verify_apply(@RequestParam("offline_apply_id") String offline_apply_id);
50
 	public void verify_apply(@RequestParam("offline_apply_id") String offline_apply_id);
51
 
51
 
52
 	/**
52
 	/**
53
+	 *  驳回
54
+	 * @param offline_apply_id
55
+	 */
56
+	@RequestMapping("/reject")
57
+	public void reject(@RequestParam("offline_apply_id") String offline_apply_id);
58
+
59
+	/**
53
 	 * 获取
60
 	 * 获取
54
 	 * 
61
 	 * 
55
 	 * @param kid
62
 	 * @param kid

+ 6 - 0
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;
4
 
4
 
5
 import org.springframework.beans.factory.annotation.Autowired;
5
 import org.springframework.beans.factory.annotation.Autowired;
6
 import org.springframework.web.bind.annotation.RequestBody;
6
 import org.springframework.web.bind.annotation.RequestBody;
7
+import org.springframework.web.bind.annotation.RequestParam;
7
 import org.springframework.web.bind.annotation.RestController;
8
 import org.springframework.web.bind.annotation.RestController;
8
 import org.tmsps.ne4spring.page.PagePackage;
9
 import org.tmsps.ne4spring.page.PagePackage;
9
 
10
 
@@ -44,6 +45,11 @@ public class ISubmitController implements OfflineSubmitApi {
44
 	}
45
 	}
45
 
46
 
46
 	@Override
47
 	@Override
48
+	public void reject(String offline_apply_id) {
49
+		wxSubmitService.reject(offline_apply_id);
50
+	}
51
+
52
+	@Override
47
 	public void add(@RequestBody PmOfflineApply pmOfflineApply) {
53
 	public void add(@RequestBody PmOfflineApply pmOfflineApply) {
48
 		t_pm_offline_apply pmOfflineApplypo = new t_pm_offline_apply();
54
 		t_pm_offline_apply pmOfflineApplypo = new t_pm_offline_apply();
49
 		BeanUtils.copyProperties(pmOfflineApply, pmOfflineApplypo);
55
 		BeanUtils.copyProperties(pmOfflineApply, pmOfflineApplypo);

+ 1 - 0
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 {
176
 		String kid = pm_item_id;
176
 		String kid = pm_item_id;
177
 		t_pm_item pm_item = pmItemService.get(kid);
177
 		t_pm_item pm_item = pmItemService.get(kid);
178
 		String bid_opening = pm_item.getBid_opening();
178
 		String bid_opening = pm_item.getBid_opening();
179
+		result.put("auction_type", pm_item.getAuction_type());
179
 		result.put("bid_opening", bid_opening);
180
 		result.put("bid_opening", bid_opening);
180
 		result.put("circusee_num", pm_item.getCircusee_num());
181
 		result.put("circusee_num", pm_item.getCircusee_num());
181
 		if (bid_opening.equals("已结束")) {
182
 		if (bid_opening.equals("已结束")) {

+ 9 - 3
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 {
405
 				if (price_bidder.compareTo(price) == -1 || price_bidder.compareTo(price) == 0) {
405
 				if (price_bidder.compareTo(price) == -1 || price_bidder.compareTo(price) == 0) {
406
 					super.setTipMsg(false, "出价失败!已有人以当前价格优先出价!", Tip.Type.success);
406
 					super.setTipMsg(false, "出价失败!已有人以当前价格优先出价!", Tip.Type.success);
407
 				} else {
407
 				} else {
408
-					// 如果在关拍前2分钟内有人出价 ,重新设置倒计时 当前系统时间+延时周期
409
-					if (pm_item.getTime_end() - System.currentTimeMillis() <= TimeEnum.THREE_MINUTES.getTime() ) {
408
+					// 如果在关拍前3分钟内有人出价 ,重新设置倒计时 当前系统时间+延时周期
409
+					if ("1".equals(pm_item.getAuction_type()) || pm_item.getTime_end() - System.currentTimeMillis() <= TimeEnum.THREE_MINUTES.getTime()) {
410
 						long new_time_end = System.currentTimeMillis() + pm_item.getUpdate_interval() * 1000;
410
 						long new_time_end = System.currentTimeMillis() + pm_item.getUpdate_interval() * 1000;
411
+						if("1".equals(pm_item.getAuction_type())){
412
+							pm_item.setArchive_status("1");
413
+						}
411
 						pmItemService.update_time_end(pm_item, new_time_end);
414
 						pmItemService.update_time_end(pm_item, new_time_end);
412
 						result.put("new_time_end", new_time_end);
415
 						result.put("new_time_end", new_time_end);
413
 					}
416
 					}
@@ -419,8 +422,11 @@ public class WxPmController extends ProjBaseAction {
419
 				if (price_bidder.compareTo(price_start) == -1) {
422
 				if (price_bidder.compareTo(price_start) == -1) {
420
 					super.setTipMsg(true, "出价不允许低于起拍价!", Tip.Type.success);
423
 					super.setTipMsg(true, "出价不允许低于起拍价!", Tip.Type.success);
421
 				} else {
424
 				} else {
422
-					if (pm_item.getTime_end() - System.currentTimeMillis() <= TimeEnum.THREE_MINUTES.getTime()) {
425
+					if ("1".equals(pm_item.getAuction_type()) || pm_item.getTime_end() - System.currentTimeMillis() <= TimeEnum.THREE_MINUTES.getTime()) {
423
 						long new_time_end = System.currentTimeMillis() + pm_item.getUpdate_interval() * 1000;
426
 						long new_time_end = System.currentTimeMillis() + pm_item.getUpdate_interval() * 1000;
427
+						if("1".equals(pm_item.getAuction_type())){
428
+							pm_item.setArchive_status("1");
429
+						}
424
 						pmItemService.update_time_end(pm_item, new_time_end);
430
 						pmItemService.update_time_end(pm_item, new_time_end);
425
 						result.put("new_time_end", new_time_end);
431
 						result.put("new_time_end", new_time_end);
426
 					}
432
 					}

+ 6 - 0
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;
2
 
2
 
3
 import org.springframework.beans.factory.annotation.Autowired;
3
 import org.springframework.beans.factory.annotation.Autowired;
4
 import org.springframework.context.annotation.Scope;
4
 import org.springframework.context.annotation.Scope;
5
+import org.springframework.util.StringUtils;
5
 import org.springframework.web.bind.annotation.RequestMapping;
6
 import org.springframework.web.bind.annotation.RequestMapping;
6
 import org.springframework.web.bind.annotation.RestController;
7
 import org.springframework.web.bind.annotation.RestController;
7
 
8
 
@@ -36,6 +37,11 @@ public class WxSubmitController extends ProjBaseAction {
36
 		JSONObject json = sessionWxService.getCurrentLoginPersion();
37
 		JSONObject json = sessionWxService.getCurrentLoginPersion();
37
 		String persion_id = json.getString("kid");
38
 		String persion_id = json.getString("kid");
38
 		pm_offline_apply.setPm_user_id(persion_id);
39
 		pm_offline_apply.setPm_user_id(persion_id);
40
+		//判断是否已经存在 存在则更新
41
+		/*t_pm_offline_apply tPmOfflineApply = wxSubmitService.findByUserAndItemId(pm_offline_apply.getPm_item_id(),pm_offline_apply.getPm_user_id());
42
+		if (tPmOfflineApply != null && !StringUtils.isEmpty(tPmOfflineApply.getKid())){
43
+			pm_offline_apply.setKid(tPmOfflineApply.getKid());
44
+		}*/
39
 		wxSubmitService.offline_apply(pm_offline_apply);
45
 		wxSubmitService.offline_apply(pm_offline_apply);
40
 		super.setTipMsg(true, "报名成功", Tip.Type.success);
46
 		super.setTipMsg(true, "报名成功", Tip.Type.success);
41
 		return result.toJSONString();
47
 		return result.toJSONString();

+ 7 - 0
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>{
39
 	 * @return
39
 	 * @return
40
 	 */
40
 	 */
41
 	public void verify_apply(String offline_apply_id);
41
 	public void verify_apply(String offline_apply_id);
42
+
43
+	/**
44
+	 * 驳回
45
+	 *
46
+	 * @return
47
+	 */
48
+	public void reject(String offline_apply_id);
42
 	
49
 	
43
 	/**
50
 	/**
44
 	 * 	线下报名绑定竞拍号
51
 	 * 	线下报名绑定竞拍号

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 16 - 0
krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/daoImpl/WxSubmitDaoImpl.java


+ 1 - 1
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;
18
 @Table
18
 @Table
19
 public class t_pm_item extends DataModel {
19
 public class t_pm_item extends DataModel {
20
 
20
 
21
-	private String auction_type;
21
+	private String auction_type; //线上 or 线下 0线上  1线下
22
 	private String item_name; // 标段名称
22
 	private String item_name; // 标段名称
23
 	private String bid_status;
23
 	private String bid_status;
24
 	private String project_item_id; // 标段id
24
 	private String project_item_id; // 标段id

+ 9 - 1
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 {
24
 	private String receive_name;
24
 	private String receive_name;
25
 	private String id_card;
25
 	private String id_card;
26
 	private String company_name;
26
 	private String company_name;
27
-	private int is_pay;//0未支付1支付
27
+	private int is_pay;//0未支付1支付2已驳回
28
+	private String file_id; // 支付凭证图片id
28
 	// ========== 系统字段 ========================
29
 	// ========== 系统字段 ========================
29
 	@PK
30
 	@PK
30
 	private String kid;
31
 	private String kid;
@@ -119,4 +120,11 @@ public class t_pm_offline_apply extends DataModel {
119
 		this.company_name = company_name;
120
 		this.company_name = company_name;
120
 	}
121
 	}
121
 
122
 
123
+	public String getFile_id() {
124
+		return file_id;
125
+	}
126
+
127
+	public void setFile_id(String file_id) {
128
+		this.file_id = file_id;
129
+	}
122
 }
130
 }

+ 2 - 0
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> {
37
 
37
 
38
 	public void verify_apply(String offline_apply_id);
38
 	public void verify_apply(String offline_apply_id);
39
 
39
 
40
+	public void reject(String offline_apply_id);
41
+
40
 	public void offline_apply_bind_code(String offline_apply_id, String pm_item_id, String offline_code);
42
 	public void offline_apply_bind_code(String offline_apply_id, String pm_item_id, String offline_code);
41
 	
43
 	
42
 	public void online_edit_code(String pm_user_id, String pm_item_id, String code);
44
 	public void online_edit_code(String pm_user_id, String pm_item_id, String code);

+ 6 - 1
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
44
 	public void verify_apply(String offline_apply_id) {
44
 	public void verify_apply(String offline_apply_id) {
45
 		wxSubmitDao.verify_apply(offline_apply_id);
45
 		wxSubmitDao.verify_apply(offline_apply_id);
46
 	}
46
 	}
47
-	
47
+
48
+	@Override
49
+	public void reject(String offline_apply_id) {
50
+		wxSubmitDao.reject(offline_apply_id);
51
+	}
52
+
48
 	@Override
53
 	@Override
49
 	public void offline_apply_bind_code(String offline_apply_id,String pm_item_id,String offline_code) {
54
 	public void offline_apply_bind_code(String offline_apply_id,String pm_item_id,String offline_code) {
50
 		wxSubmitDao.offline_apply_bind_code(offline_apply_id,pm_item_id,offline_code);
55
 		wxSubmitDao.offline_apply_bind_code(offline_apply_id,pm_item_id,offline_code);

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

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