质检

@@ -14,7 +14,7 @@ public interface SignForPackageMapper {
 	
 	
 	int insert(SignForPackage signForPackage);
 	int insert(SignForPackage signForPackage);
 	
 	
-	List<String> selectByCondition(@Param("buyerOrderReq") BuyerOrderReq buyerOrderReq);
+	List<SignForPackage> selectByCondition(@Param("buyerOrderReq") BuyerOrderReq buyerOrderReq);
 	
 	
 	int selectCountByDate(@Param("date") Integer date, @Param("depotNo") Integer depotNo);
 	int selectCountByDate(@Param("date") Integer date, @Param("depotNo") Integer depotNo);
 	
 	

@@ -46,8 +46,8 @@
         <include refid="Query_Sql"></include>
         <include refid="Query_Sql"></include>
     </select>
     </select>
     
     
-    <select id="selectByCondition" resultType="java.lang.String" parameterType="com.yoho.order.model.BuyerOrderReq">
-      select seller_waybillCode
+    <select id="selectByCondition" resultMap="BaseResultMap" parameterType="com.yoho.order.model.BuyerOrderReq">
+      select <include refid="Base_Column_List"></include> 
       from sign_for_package  
       from sign_for_package  
       where 1=1 
       where 1=1 
       <include refid="Query_Sql"></include>
       <include refid="Query_Sql"></include>

@@ -449,11 +449,8 @@ public class BuyerOrderController {
 		if(StringUtils.isEmpty(req.getSellerWaybillCode()) || null == req.getDepotNo()) {
 		if(StringUtils.isEmpty(req.getSellerWaybillCode()) || null == req.getDepotNo()) {
 			return new ApiResponse.ApiResponseBuilder().code(500).message("卖家运单号或收货地不能为空").build();
 			return new ApiResponse.ApiResponseBuilder().code(500).message("卖家运单号或收货地不能为空").build();
 		}
 		}
-		int result = buyerOrderService.signForPackage(req.getSellerWaybillCode(), req.getDepotNo());
-		if(result > 0) {
-			return new ApiResponse.ApiResponseBuilder().code(200).message("签收成功").data(result).build();
-		}
-		return new ApiResponse.ApiResponseBuilder().code(500).message("签收失败").build();
+		buyerOrderService.signForPackage(req.getSellerWaybillCode(), req.getDepotNo());
+		return new ApiResponse.ApiResponseBuilder().code(500).message("签收成功").build();
 	}
 	}
 	
 	
 	@RequestMapping(value = "/getPackageCount")
 	@RequestMapping(value = "/getPackageCount")
@@ -462,7 +459,7 @@ public class BuyerOrderController {
 		if(null == req.getDepotNo()) {
 		if(null == req.getDepotNo()) {
 			return new ApiResponse.ApiResponseBuilder().code(500).message("收货地不能为空").build();
 			return new ApiResponse.ApiResponseBuilder().code(500).message("收货地不能为空").build();
 		}
 		}
-		int result = buyerOrderService.getPackageCount(req.getDepotNo());
+		int result = buyerOrderService.getPackageCount(req.getDepotNo(), req.getDate());
 		return new ApiResponse.ApiResponseBuilder().code(200).message("查询成功").data(result).build();
 		return new ApiResponse.ApiResponseBuilder().code(200).message("查询成功").data(result).build();
 	}
 	}
 	
 	
@@ -472,7 +469,7 @@ public class BuyerOrderController {
 		if(null == req.getDepotNo()) {
 		if(null == req.getDepotNo()) {
 			return new ApiResponse.ApiResponseBuilder().code(500).message("收货地不能为空").build();
 			return new ApiResponse.ApiResponseBuilder().code(500).message("收货地不能为空").build();
 		}
 		}
-		PageResponseBO<String> result = buyerOrderService.queryPackage(req.getDepotNo(), req.getSellerWaybillCode());
+		PageResponseBO<String> result = buyerOrderService.queryPackage(req.getDepotNo(), req.getSellerWaybillCode(), req.getDate());
 		return new ApiResponse.ApiResponseBuilder().code(200).message("查询成功").data(result).build();
 		return new ApiResponse.ApiResponseBuilder().code(200).message("查询成功").data(result).build();
 	}
 	}
 
 

@@ -103,9 +103,9 @@ public interface IBuyerOrderService {
 	
 	
 	JSONObject getSfWaybillCode(BuyerOrderReq req);
 	JSONObject getSfWaybillCode(BuyerOrderReq req);
 	
 	
-	int signForPackage(String sellerWaybillCode, Integer depotNo);
+	void signForPackage(String sellerWaybillCode, Integer depotNo);
 	
 	
-	int getPackageCount(Integer depotNo);
+	int getPackageCount(Integer depotNo, Integer date);
 	
 	
-	PageResponseBO<String> queryPackage(Integer depotNo, String sellerWaybillCode);
+	PageResponseBO<String> queryPackage(Integer depotNo, String sellerWaybillCode, Integer date);
 }
 }

@@ -1718,38 +1718,47 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
     }
     }
     
     
     @Override
     @Override
-    public int signForPackage(String sellerWaybillCode, Integer depotNo) {
+    public void signForPackage(String sellerWaybillCode, Integer depotNo) {
+    	BuyerOrderReq req = new BuyerOrderReq();
+    	req.setSellerWaybillCode(sellerWaybillCode);
+    	req.setDate(Integer.parseInt(DateUtil.getCurrentDateStr()));
+    	List<SignForPackage> list = signForPackageMapper.selectByCondition(req);
+    	if(CollectionUtils.isNotEmpty(list)) {
+    		return;
+    	}
+    	
     	SignForPackage pkg = new SignForPackage();
     	SignForPackage pkg = new SignForPackage();
     	pkg.setDate(Integer.parseInt(DateUtil.getCurrentDateStr()));
     	pkg.setDate(Integer.parseInt(DateUtil.getCurrentDateStr()));
     	pkg.setSellerWaybillCode(sellerWaybillCode);
     	pkg.setSellerWaybillCode(sellerWaybillCode);
     	pkg.setDepotNo(depotNo);
     	pkg.setDepotNo(depotNo);
     	pkg.setSignTime(DateUtil.getCurrentTimeSeconds());
     	pkg.setSignTime(DateUtil.getCurrentTimeSeconds());
     	
     	
-    	return signForPackageMapper.insert(pkg);
+    	signForPackageMapper.insert(pkg);
     }
     }
     
     
     @Override
     @Override
-    public int getPackageCount(Integer depotNo) {
+    public int getPackageCount(Integer depotNo, Integer date) {
     	Integer currentDate = Integer.valueOf(DateUtil.getCurrentDateStr());
     	Integer currentDate = Integer.valueOf(DateUtil.getCurrentDateStr());
-    	return signForPackageMapper.selectCountByDate(currentDate, depotNo);
+    	return signForPackageMapper.selectCountByDate(null == date ? currentDate : date, depotNo);
     }
     }
     
     
     @Override
     @Override
-    public PageResponseBO<String> queryPackage(Integer depotNo, String sellerWaybillCode) {
+    public PageResponseBO<String> queryPackage(Integer depotNo, String sellerWaybillCode, Integer date) {
     	
     	
     	BuyerOrderReq req = new BuyerOrderReq();
     	BuyerOrderReq req = new BuyerOrderReq();
     	req.setDepotNo(depotNo);
     	req.setDepotNo(depotNo);
     	req.setSellerWaybillCode(sellerWaybillCode);
     	req.setSellerWaybillCode(sellerWaybillCode);
-    	req.setDate(Integer.valueOf(DateUtil.getCurrentDateStr()));
+    	req.setDate(null == date ? Integer.valueOf(DateUtil.getCurrentDateStr()) : date);
     	
     	
     	int total = signForPackageMapper.selectTotalByCondition(req);
     	int total = signForPackageMapper.selectTotalByCondition(req);
     	if(total == 0) {
     	if(total == 0) {
     		return null;
     		return null;
     	}
     	}
     	
     	
-    	List<String> list = signForPackageMapper.selectByCondition(req);
+    	List<SignForPackage> list = signForPackageMapper.selectByCondition(req);
+    	List<String> sellerWaybillCodeList = list.stream().map(SignForPackage::getSellerWaybillCode).collect(Collectors.toList());
     	PageResponseBO<String> result=new PageResponseBO<>();
     	PageResponseBO<String> result=new PageResponseBO<>();
-        result.setList(list);
+        result.setList(sellerWaybillCodeList);
         result.setPage(req.getPage());
         result.setPage(req.getPage());
         result.setSize(req.getSize());
         result.setSize(req.getSize());
         result.setTotal(total);
         result.setTotal(total);