Эх сурвалжийг харах

更新添加购物车状态及下载客户在平台下单的订单的状态判断方法

hejq 8 жил өмнө
parent
commit
7fa5bd8226

+ 5 - 1
src/main/java/com/uas/platform/b2b/dao/PurchaseOrderAllDao.java

@@ -5,6 +5,7 @@ import java.util.List;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.jpa.repository.query.Procedure;
 import org.springframework.data.repository.query.Param;
@@ -12,6 +13,8 @@ import org.springframework.stereotype.Repository;
 
 import com.uas.platform.b2b.model.PurchaseOrderAll;
 
+import javax.transaction.Transactional;
+
 @Repository
 public interface PurchaseOrderAllDao extends JpaSpecificationExecutor<PurchaseOrderAll>, JpaRepository<PurchaseOrderAll, Long> {
 
@@ -40,7 +43,8 @@ public interface PurchaseOrderAllDao extends JpaSpecificationExecutor<PurchaseOr
 	 *            状态
 	 * @return
 	 */
-	public List<PurchaseOrderAll> findByVendUUAndSendStatus(long vendUU, short sendStatus);
+	@Query("from PurchaseOrderAll where vendUU = :vendUU and sendStatus = :sendStatus and status <> 311")
+	public List<PurchaseOrderAll> findByVendUUAndSendStatus(@Param("vendUU") long vendUU, @Param("sendStatus") short sendStatus);
 	
 	/**
 	 * 根据截止日期获取

+ 0 - 1
src/main/java/com/uas/platform/b2b/service/impl/BaseInfoServiceImpl.java

@@ -673,7 +673,6 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 		order.setCurrency(neworder.getCurrency());
 		order.setShipAddress(neworder.getShipaddress());
 		order.setStatus((short) neworder.getStatus());
-		order.setSendStatus((short) Status.NOT_UPLOAD.value());
 		order.setCurrency(neworder.getCurrency());
 		order.setPayments(neworder.getPayments());
 		order.setRemark(neworder.getRemark());