Просмотр исходного кода

处理配送商排序乱排的问题

hulh 8 лет назад
Родитель
Сommit
0cf8ad84d2

+ 1 - 1
src/main/java/com/uas/platform/b2c/logistics/dao/DistributorSellerDao.java

@@ -20,7 +20,7 @@ public interface DistributorSellerDao extends JpaSpecificationExecutor<Distribut
 	 * 根据企业enuu查询选中配送商
 	 * @return
 	 */
-	List<DistributorSeller> findByEnuuOrderByCreatetimeDesc(Long enuu);
+	List<DistributorSeller> findByEnuuOrderByNumAsc(Long enuu);
 
 	/**
 	 * 根据指定id删除该配送商

+ 14 - 0
src/main/java/com/uas/platform/b2c/logistics/model/DistributorSeller.java

@@ -53,6 +53,12 @@ public class DistributorSeller {
 	@Column(name = "seller_createtime")
 	private Date createtime;
 
+	/**
+	 * 配送商排序
+	 */
+	@Column(name = "seller_num")
+	private Integer num;
+
 	public Long getId() {
 		return id;
 	}
@@ -108,4 +114,12 @@ public class DistributorSeller {
 	public void setCreatetime(Date createtime) {
 		this.createtime = createtime;
 	}
+
+	public Integer getNum() {
+		return num;
+	}
+
+	public void setNum(Integer num) {
+		this.num = num;
+	}
 }

+ 3 - 1
src/main/java/com/uas/platform/b2c/logistics/service/impl/DistributorSellerServiceImpl.java

@@ -27,7 +27,7 @@ public class DistributorSellerServiceImpl implements DistributorSellerService {
 	@Override
 	public List<DistributorSeller> findAllChooseDistributor() {
 		Long enuu = SystemSession.getUser().getEnterprise().getUu();
-		return distributorSellerDao.findByEnuuOrderByCreatetimeDesc(enuu);
+		return distributorSellerDao.findByEnuuOrderByNumAsc(enuu);
 	}
 
 	@Override
@@ -36,6 +36,7 @@ public class DistributorSellerServiceImpl implements DistributorSellerService {
 		Long enuu = SystemSession.getUser().getEnterprise().getUu();
 		Long useruu = SystemSession.getUser().getUserUU();
 		distributorSellerDao.deleteDistributorByEnuu(enuu);//保存前先清空表
+		int num = 1;
 		for (JSONObject object : objects){
 			DistributorSeller distributor = new DistributorSeller();
 			if (object.getString("code") != null){
@@ -48,6 +49,7 @@ public class DistributorSellerServiceImpl implements DistributorSellerService {
 			distributor.setUseruu(useruu);
 			distributor.setEnuu(enuu);
 			distributor.setCreatetime(new Date());
+			distributor.setNum(num++);
 			savaList.add(distributor);
 		}
 		return distributorSellerDao.save(savaList);

+ 1 - 1
src/main/webapp/resources/view/vendor/forstore/vendor_delivery_rule.html

@@ -345,7 +345,7 @@
 				<div class="row" style="position: relative;">
 					<span><strong>*</strong>适用地区</span>
 					<div class="area-content" ng-if="mapArray.length >0" style="max-height: 123px; overflow-y: auto;">
-						<span ng-repeat="data in mapArray" ng-click="deleteMapItem($index)">
+						<span ng-repeat="data in mapArray">
 							<em ng-if="data.mainland">{{data.mainland}}</em>
 							<em ng-if="data.province">{{data.province}}</em>
 							<em ng-if="data.city">/{{data.city}}</em>