1：修改交期的字段名称。

src/main/java/com/uas/platform/b2c/prod/commodity/model/Goods.java

@@ -400,50 +400,50 @@ public class Goods implements Serializable {
 	 * 用户自己填写的大陆最大交期
 	 */
 	@Column(name = "go_selfdeliverydemaxtime")
-	private Short selfMaxDeliveryDemTime;
+	private Short selfDeliveryDemMaxTime;
 
 	/**
 	 * 用户自己填写大陆的最小交期
 	 */
 	@Column(name = "go_selfdeliverydemintime")
-	private Short selfMinDeliveryDemTime;
+	private Short selfDeliveryDemMinTime;
 
 	/**
 	 * 用户自己香港填写的最大交期
 	 */
 	@Column(name = "go_selfdeliveryhkmaxtime")
-	private Short selfMaxDeliveryhkTime;
+	private Short selfDeliveryHKMaxTime;
 
 	/**
 	 * 用户自己香港填写的最小交期
 	 */
 	@Column(name = "go_selfdeliveryhkmintime")
-	private Short selfMinxDeliveryhkTime;
+	private Short selfDeliveryHKMinTime;
 
 	/**
 	 * 商城送货到大陆最长交期
 	 */
 	@Column(name = "go_deliverydemaxtime")
-	private Short b2cMaxDeliveryDemTime;
+	private Short b2cDeliveryDemMaxTime;
 
 	/**
 	 * 商城送货到大陆最短交期
 	 */
 	@Column(name = "go_deliverydemintime")
-	private Short b2cMinDeliveryDemTime;
+	private Short b2cDeliveryDemMinTime;
 
 
 	/**
 	 * 商城送货到香港最长交期
 	 */
 	@Column(name = "go_deliveryhkmaxtime")
-	private Short b2cMaxDeliveryHKTime;
+	private Short b2cDeliveryHKMaxTime;
 
 	/**
 	 * 商城送货到香港最小交期
 	 */
 	@Column(name = "go_deliveryhkmintime")
-	private Short b2cMinDeliveryHKTime;
+	private Short b2cDeliveryHKMinTime;
 
 	/**
 	 * 产品主键
@@ -846,43 +846,79 @@ public class Goods implements Serializable {
 		return this;
 	}
 
-	public Short getSelfMaxDeliveryDemTime() {
-		return selfMaxDeliveryDemTime;
-	}
+    public Short getSelfDeliveryDemMaxTime() {
+        return selfDeliveryDemMaxTime;
+    }
 
-	public Goods setSelfMaxDeliveryDemTime(Short selfMaxDeliveryDemTime) {
-		this.selfMaxDeliveryDemTime = selfMaxDeliveryDemTime;
-		return this;
-	}
+    public Goods setSelfDeliveryDemMaxTime(Short selfDeliveryDemMaxTime) {
+        this.selfDeliveryDemMaxTime = selfDeliveryDemMaxTime;
+        return this;
+    }
 
-	public Short getSelfMinDeliveryDemTime() {
-		return selfMinDeliveryDemTime;
-	}
+    public Short getSelfDeliveryDemMinTime() {
+        return selfDeliveryDemMinTime;
+    }
 
-	public Goods setSelfMinDeliveryDemTime(Short selfMinDeliveryDemTime) {
-		this.selfMinDeliveryDemTime = selfMinDeliveryDemTime;
-		return this;
-	}
+    public Goods setSelfDeliveryDemMinTime(Short selfDeliveryDemMinTime) {
+        this.selfDeliveryDemMinTime = selfDeliveryDemMinTime;
+        return this;
+    }
 
-	public Short getSelfMaxDeliveryhkTime() {
-		return selfMaxDeliveryhkTime;
-	}
+    public Short getSelfDeliveryHKMaxTime() {
+        return selfDeliveryHKMaxTime;
+    }
 
-	public Goods setSelfMaxDeliveryhkTime(Short selfMaxDeliveryhkTime) {
-		this.selfMaxDeliveryhkTime = selfMaxDeliveryhkTime;
-		return this;
-	}
+    public Goods setSelfDeliveryHKMaxTime(Short selfDeliveryHKMaxTime) {
+        this.selfDeliveryHKMaxTime = selfDeliveryHKMaxTime;
+        return this;
+    }
 
-	public Short getSelfMinxDeliveryhkTime() {
-		return selfMinxDeliveryhkTime;
-	}
+    public Short getSelfDeliveryHKMinTime() {
+        return selfDeliveryHKMinTime;
+    }
 
-	public Goods setSelfMinxDeliveryhkTime(Short selfMinxDeliveryhkTime) {
-		this.selfMinxDeliveryhkTime = selfMinxDeliveryhkTime;
-		return this;
-	}
+    public Goods setSelfDeliveryHKMinTime(Short selfDeliveryHKMinTime) {
+        this.selfDeliveryHKMinTime = selfDeliveryHKMinTime;
+        return this;
+    }
 
-	public Short getMaxDelivery() {
+    public Short getB2cDeliveryDemMaxTime() {
+        return b2cDeliveryDemMaxTime;
+    }
+
+    public Goods setB2cDeliveryDemMaxTime(Short b2cDeliveryDemMaxTime) {
+        this.b2cDeliveryDemMaxTime = b2cDeliveryDemMaxTime;
+        return this;
+    }
+
+    public Short getB2cDeliveryDemMinTime() {
+        return b2cDeliveryDemMinTime;
+    }
+
+    public Goods setB2cDeliveryDemMinTime(Short b2cDeliveryDemMinTime) {
+        this.b2cDeliveryDemMinTime = b2cDeliveryDemMinTime;
+        return this;
+    }
+
+    public Short getB2cDeliveryHKMaxTime() {
+        return b2cDeliveryHKMaxTime;
+    }
+
+    public Goods setB2cDeliveryHKMaxTime(Short b2cDeliveryHKMaxTime) {
+        this.b2cDeliveryHKMaxTime = b2cDeliveryHKMaxTime;
+        return this;
+    }
+
+    public Short getB2cDeliveryHKMinTime() {
+        return b2cDeliveryHKMinTime;
+    }
+
+    public Goods setB2cDeliveryHKMinTime(Short b2cDeliveryHKMinTime) {
+        this.b2cDeliveryHKMinTime = b2cDeliveryHKMinTime;
+        return this;
+    }
+
+    public Short getMaxDelivery() {
 		return maxDelivery;
 	}
 
@@ -1338,39 +1374,4 @@ public class Goods implements Serializable {
 		return true;
 	}
 
-	public Short getB2cMaxDeliveryDemTime() {
-		return b2cMaxDeliveryDemTime;
-	}
-
-	public Goods setB2cMaxDeliveryDemTime(Short b2cMaxDeliveryDemTime) {
-		this.b2cMaxDeliveryDemTime = b2cMaxDeliveryDemTime;
-		return this;
-	}
-
-	public Short getB2cMinDeliveryDemTime() {
-		return b2cMinDeliveryDemTime;
-	}
-
-	public Goods setB2cMinDeliveryDemTime(Short b2cMinDeliveryDemTime) {
-		this.b2cMinDeliveryDemTime = b2cMinDeliveryDemTime;
-		return this;
-	}
-
-	public Short getB2cMaxDeliveryHKTime() {
-		return b2cMaxDeliveryHKTime;
-	}
-
-	public Goods setB2cMaxDeliveryHKTime(Short b2cMaxDeliveryHKTime) {
-		this.b2cMaxDeliveryHKTime = b2cMaxDeliveryHKTime;
-		return this;
-	}
-
-	public Short getB2cMinDeliveryHKTime() {
-		return b2cMinDeliveryHKTime;
-	}
-
-	public Goods setB2cMinDeliveryHKTime(Short b2cMinDeliveryHKTime) {
-		this.b2cMinDeliveryHKTime = b2cMinDeliveryHKTime;
-		return this;
-	}
 }

src/main/java/com/uas/platform/b2c/prod/commodity/model/ReleaseProductByBatch.java

@@ -167,25 +167,25 @@ public class ReleaseProductByBatch implements Serializable {
 	 * 用户填写的大陆最长交期
 	 */
 	@Column(name = "rel_maxdeliverydemtime")
-	private Short maxdeliveryDemTime;
+	private Short deliveryDemMaxTime;
 
 	/**
 	 * 用户填写的大陆最短交期
 	 */
 	@Column(name = "rel_mindeliverydemtime")
-	private Short mindeliveryDemTime;
+	private Short deliveryDemMinTime;
 
 	/**
 	 * 用户填写的香港最短交期
 	 */
 	@Column(name = "rel_mindeliveryhktime")
-	private Short mindeliveryHKTime;
+	private Short deliveryHKMinTime;
 
 	/**
 	 * 用户填写的香港最长交期
 	 */
 	@Column(name = "rel_maxdeliveryhktime")
-	private Short maxdeliveryHKTime;
+	private Short deliveryHKMaxTime;
 
 	/**
 	 * 备注
@@ -999,10 +999,10 @@ public class ReleaseProductByBatch implements Serializable {
 		goods.setCreatedDate(new Date());
 		goods.setUpdateDate(new Date());
 		// 交货周期 暂未做最长与最短
-		goods.setSelfMaxDeliveryDemTime(releaseProductByBatch.getMaxdeliveryDemTime());
-		goods.setSelfMinDeliveryDemTime(releaseProductByBatch.getMindeliveryDemTime());
-		goods.setSelfMaxDeliveryhkTime(releaseProductByBatch.getMaxdeliveryHKTime());
-		goods.setSelfMinxDeliveryhkTime(releaseProductByBatch.getMindeliveryHKTime());
+		goods.setSelfDeliveryDemMaxTime(releaseProductByBatch.getDeliveryDemMaxTime());
+		goods.setSelfDeliveryDemMinTime(releaseProductByBatch.getDeliveryDemMinTime());
+		goods.setSelfDeliveryHKMaxTime(releaseProductByBatch.getDeliveryHKMaxTime());
+		goods.setSelfDeliveryHKMinTime(releaseProductByBatch.getDeliveryHKMinTime());
 		goods.setProduceDate(releaseProductByBatch.getProductDate());
 		goods.setPublisherUU(releaseProductByBatch.getPublisherUu());
 		goods.setPublisherName(releaseProductByBatch.getPublisherName());
@@ -1063,39 +1063,39 @@ public class ReleaseProductByBatch implements Serializable {
 		return serialVersionUID;
 	}
 
-	public Short getMaxdeliveryDemTime() {
-		return maxdeliveryDemTime;
+	public Short getDeliveryDemMaxTime() {
+		return deliveryDemMaxTime;
 	}
 
-	public ReleaseProductByBatch setMaxdeliveryDemTime(Short maxdeliveryDemTime) {
-		this.maxdeliveryDemTime = maxdeliveryDemTime;
+	public ReleaseProductByBatch setDeliveryDemMaxTime(Short deliveryDemMaxTime) {
+		this.deliveryDemMaxTime = deliveryDemMaxTime;
 		return this;
 	}
 
-	public Short getMindeliveryDemTime() {
-		return mindeliveryDemTime;
+	public Short getDeliveryDemMinTime() {
+		return deliveryDemMinTime;
 	}
 
-	public ReleaseProductByBatch setMindeliveryDemTime(Short mindeliveryDemTime) {
-		this.mindeliveryDemTime = mindeliveryDemTime;
+	public ReleaseProductByBatch setDeliveryDemMinTime(Short deliveryDemMinTime) {
+		this.deliveryDemMinTime = deliveryDemMinTime;
 		return this;
 	}
 
-	public Short getMindeliveryHKTime() {
-		return mindeliveryHKTime;
+	public Short getDeliveryHKMinTime() {
+		return deliveryHKMinTime;
 	}
 
-	public ReleaseProductByBatch setMindeliveryHKTime(Short mindeliveryHKTime) {
-		this.mindeliveryHKTime = mindeliveryHKTime;
+	public ReleaseProductByBatch setDeliveryHKMinTime(Short deliveryHKMinTime) {
+		this.deliveryHKMinTime = deliveryHKMinTime;
 		return this;
 	}
 
-	public Short getMaxdeliveryHKTime() {
-		return maxdeliveryHKTime;
+	public Short getDeliveryHKMaxTime() {
+		return deliveryHKMaxTime;
 	}
 
-	public ReleaseProductByBatch setMaxdeliveryHKTime(Short maxdeliveryHKTime) {
-		this.maxdeliveryHKTime = maxdeliveryHKTime;
+	public ReleaseProductByBatch setDeliveryHKMaxTime(Short deliveryHKMaxTime) {
+		this.deliveryHKMaxTime = deliveryHKMaxTime;
 		return this;
 	}
 }

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ReleaseProductByBatchServiceImpl.java

@@ -297,14 +297,14 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 						if (!StringUtils.isEmpty(deliveryCellValue)) {
 							Short[] delivers = splitDeliveryString(deliveryCellValue.toString());
 							if (delivers != null) {
-								releaseProductByBatch.setMindeliveryDemTime(delivers[0]);
-								releaseProductByBatch.setMaxdeliveryDemTime(delivers[1]);
+								releaseProductByBatch.setDeliveryDemMinTime(delivers[0]);
+								releaseProductByBatch.setDeliveryDemMaxTime(delivers[1]);
 
-								Boolean aBoolean = deliveryTimeBetween(releaseProductByBatch.getMaxdeliveryDemTime(), (short) 0, (short) 9);
+								Boolean aBoolean = deliveryTimeBetween(releaseProductByBatch.getDeliveryDemMaxTime(), (short) 0, (short) 9);
 								if(!aBoolean) {
 									releaseProductByBatch.addErrmsg("14:大陆交期的不在(0,9]天");
 								}
-								Boolean bBoolean = deliveryTimeBetween(releaseProductByBatch.getMindeliveryDemTime(), (short) 0, (short) 9);
+								Boolean bBoolean = deliveryTimeBetween(releaseProductByBatch.getDeliveryDemMinTime(), (short) 0, (short) 9);
 								if(!bBoolean) {
 									releaseProductByBatch.addErrmsg("14:大陆交期的不在(0,9]天");
 								}
@@ -318,14 +318,14 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 						if (!StringUtils.isEmpty(deliveryhkCellValue)) {
 							Short[] deliverys = splitDeliveryString(deliveryhkCellValue.toString());
 							if (deliverys != null) {
-								releaseProductByBatch.setMindeliveryHKTime(deliverys[0]);
-								releaseProductByBatch.setMaxdeliveryHKTime(deliverys[1]);
+								releaseProductByBatch.setDeliveryHKMinTime(deliverys[0]);
+								releaseProductByBatch.setDeliveryHKMaxTime(deliverys[1]);
 
-								Boolean aBoolean = deliveryTimeBetween(releaseProductByBatch.getMindeliveryHKTime(), (short) 0, (short) 9);
+								Boolean aBoolean = deliveryTimeBetween(releaseProductByBatch.getDeliveryHKMinTime(), (short) 0, (short) 9);
 								if(!aBoolean) {
 									releaseProductByBatch.addErrmsg("15:香港交期的不在(0,9]天");
 								}
-								Boolean bBoolean = deliveryTimeBetween(releaseProductByBatch.getMaxdeliveryHKTime(), (short) 0, (short) 9);
+								Boolean bBoolean = deliveryTimeBetween(releaseProductByBatch.getDeliveryHKMaxTime(), (short) 0, (short) 9);
 								if(!bBoolean) {
 									releaseProductByBatch.addErrmsg("15:香港交期的不在(0,9]天");
 								}
@@ -334,19 +334,19 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 					}
 
 					if("RMB-USD".equals(releaseProductByBatch.getCurrency())) {
-						if(releaseProductByBatch.getMaxdeliveryDemTime() == null ||  releaseProductByBatch.getMaxdeliveryHKTime() == null) {
+						if(releaseProductByBatch.getDeliveryDemMaxTime() == null ||  releaseProductByBatch.getDeliveryHKMaxTime() == null) {
 							releaseProductByBatch.addErrmsg("14-15:您上架的币别是人民币和美金，所以香港和大陆的交期都需要填写");
 						}
 					}else if("RMB".equals(releaseProductByBatch.getCurrency())) {
-						if(releaseProductByBatch.getMaxdeliveryDemTime() == null) {
+						if(releaseProductByBatch.getDeliveryDemMaxTime() == null) {
 							releaseProductByBatch.addErrmsg("14-15:您上架的币别是人民币,所以大陆交期需要填写");
 						}
 					}else if("USD".equals(releaseProductByBatch.getCurrency())) {
-						if(releaseProductByBatch.getMaxdeliveryHKTime() == null) {
+						if(releaseProductByBatch.getDeliveryHKMaxTime() == null) {
 							releaseProductByBatch.addErrmsg("14-15:您上架的币别是美金,所以香港交期需要填写");
 						}
 					}else {
-						if(releaseProductByBatch.getMaxdeliveryHKTime() == null && releaseProductByBatch.getMaxdeliveryHKTime() == null) {
+						if(releaseProductByBatch.getDeliveryDemMaxTime() == null && releaseProductByBatch.getDeliveryHKMaxTime() == null) {
 							releaseProductByBatch.addErrmsg("14-15:您必须要填写一个类型的交期");
 						}
 					}

src/main/java/com/uas/platform/b2c/trade/order/controller/OrderController.java

@@ -883,7 +883,7 @@ public class OrderController {
 	/**
 	 * 根据订单号获取Order对象
 	 *
-	 * @param enOrderid 加密的订单id
+	 * @param enOrderid 加密的订单idp
 	 * @return
 	 */
 	@RequestMapping(value = "/findStatus")

src/main/webapp/resources/js/prod/controllers/ProductListByKindCtrl.js

@@ -263,14 +263,10 @@ define([ 'app/app' ], function(app) {
 					var newWidow = window.open('product#/cart');
 					// 1、生成订单
 					Order.buyNow({}, goodsList, function(data){
-						var orderids = [];
-						angular.forEach(data, function(order) {
-							orderids.push(order.orderid );
-						});
 						// 控制订单确认页，直接购买不显示进度条
 						SessionService.set("buyNow", true);
 						// 2、跳转到订单确认页面，进行付款操作
-						newWidow.location.href ='user#/order/pay/'+ enIdFilter(data.orderid);
+						newWidow.location.href ='user#/order/pay/'+ enIdFilter(data.data.orderid);
 					}, function(res){
 						newWidow.close();
 						toaster.pop('error', '警告', res.data);

src/main/webapp/resources/view/vendor/forstore/vendor_upload.html

@@ -278,6 +278,10 @@
     .load_next .add_category .upload01{
         top: 6px;
     }
+
+    label.sellType:hover {
+        cursor: pointer;
+    }
 </style>
 <div class="user_right fr">
     <!--货品管理-->
@@ -310,15 +314,15 @@
                     <div class="add_category">
                         <div>1、请选择是店铺自营还是优软代售</div>
                         <div class="sale-label">
-                            <label>
-                                 <input type="radio" name="487" id="sellbyUAS" ng-checked="batch.sellType == 'UAS'">
-                                <label for="sellbyUAS" ng-click="sellType('UAS')"></label>
+                            <label class="sellType">
+                                <input ng-click="sellType('UAS')" type="radio" name="487" id="sellbyUAS" ng-model="batch.sellType" ng-checked="batch.sellType == 'UAS'">
+                                <label for="sellbyUAS"></label>
                                 <span>优软代售</span>
                             </label>
-                            <label ng-disabled="!batch.selfSellEabled">
-                                <input type="radio" name="487" id="sellbyself" ng-checked="batch.sellType == 'self'" ng-disabled="!batch.selfSellEabled">
-                                <label for="sellbyself" ng-click="sellType('self')" ng-disabled="!batch.selfSellEabled"></label>
-                                <span ng-disabled="!batch.selfSellEabled">店铺自营</span>
+                            <label class="sellType" ng-disabled="!batch.selfSellEabled">
+                                <input ng-click="sellType('self')" type="radio" name="487" id="sellbyself" ng-model="batch.sellType" ng-checked="batch.sellType == 'self'">
+                                <label for="sellbyself"></label>
+                                <span>店铺自营</span>
                             </label>
                         </div>
                         <div>2、请上传已经编辑好的库存表格，选择好上传的文件之后，点击确认上传</div>