确认收货优化

@@ -11,7 +11,7 @@ import com.yoho.order.model.AbnormalPackage;
  */
  */
 public interface AbnormalPackageMapper {
 public interface AbnormalPackageMapper {
 	
 	
-	AbnormalPackage selectByWaybillCode(@Param("sellerWaybillCode") String sellerWaybillCode);
+	AbnormalPackage selectBySellerWaybillCode(@Param("sellerWaybillCode") String sellerWaybillCode);
 
 
 	int insert(AbnormalPackage abnormalPackage);
 	int insert(AbnormalPackage abnormalPackage);
 	
 	

@@ -27,13 +27,13 @@
         from abnormal_package where seller_waybillCode = #{sellerWaybillCode}
         from abnormal_package where seller_waybillCode = #{sellerWaybillCode}
     </select>
     </select>
     
     
-    <insert id="insert" parameterType="com.yoho.order.model.AbnormalExpress">
+    <insert id="insert" parameterType="com.yoho.order.model.AbnormalPackage">
         insert into abnormal_package(id, seller_waybillCode, is_del, create_time, operate_uid, update_time)
         insert into abnormal_package(id, seller_waybillCode, is_del, create_time, operate_uid, update_time)
         values (#{id}, #{sellerWaybillCode}, #{isDel}, #{createTime}, #{operateUid}, #{updateTime})
         values (#{id}, #{sellerWaybillCode}, #{isDel}, #{createTime}, #{operateUid}, #{updateTime})
     </insert>
     </insert>
     
     
     <update id="update">
     <update id="update">
-        update abnormal_package set operateUid=#{operateUid}, update_time=#{updateTime} 
+        update abnormal_package set operate_uid=#{operateUid}, update_time=#{updateTime}, is_del=0  
         where seller_waybillCode = #{sellerWaybillCode}
         where seller_waybillCode = #{sellerWaybillCode}
     </update>
     </update>
 </mapper>
 </mapper>

@@ -518,7 +518,6 @@ public class BuyerOrderController {
 		}else {
 		}else {
 			return new ApiResponse.ApiResponseBuilder().code(500).message("添加异常包裹失败").build();
 			return new ApiResponse.ApiResponseBuilder().code(500).message("添加异常包裹失败").build();
 		}
 		}
-		
 	}
 	}
 
 
 }
 }

@@ -99,7 +99,6 @@ import com.yoho.ufo.order.request.SaveQualityCheckInfoRequest;
 import com.yoho.ufo.order.service.IBuyerOrderService;
 import com.yoho.ufo.order.service.IBuyerOrderService;
 import com.yoho.ufo.service.impl.UfoServiceCaller;
 import com.yoho.ufo.service.impl.UfoServiceCaller;
 import com.yoho.ufo.service.impl.UserHelper;
 import com.yoho.ufo.service.impl.UserHelper;
-import com.yoho.ufo.service.model.ApiResponse;
 import com.yoho.ufo.service.model.PageResponseBO;
 import com.yoho.ufo.service.model.PageResponseBO;
 import com.yoho.ufo.util.DateUtil;
 import com.yoho.ufo.util.DateUtil;
 import com.yoho.ufo.util.ImagesConstant;
 import com.yoho.ufo.util.ImagesConstant;
@@ -2479,7 +2478,7 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
     @Override
     @Override
     public int addAbnormalPackage(String sellerWaybillCode) {
     public int addAbnormalPackage(String sellerWaybillCode) {
     	//数据库已存在
     	//数据库已存在
-    	AbnormalPackage pkg = abnormalPackageMapper.selectByWaybillCode(sellerWaybillCode);
+    	AbnormalPackage pkg = abnormalPackageMapper.selectBySellerWaybillCode(sellerWaybillCode);
     	if(null != pkg) {
     	if(null != pkg) {
         	return abnormalPackageMapper.update(new UserHelper().getUserId(), DateUtil.getCurrentTimeSeconds(), sellerWaybillCode);
         	return abnormalPackageMapper.update(new UserHelper().getUserId(), DateUtil.getCurrentTimeSeconds(), sellerWaybillCode);
     	}
     	}

@@ -55,7 +55,7 @@ datasources:
         - com.yoho.order.dal.OrderCouponMapper
         - com.yoho.order.dal.OrderCouponMapper
         - com.yoho.order.dal.ManualInputPermissionMapper
         - com.yoho.order.dal.ManualInputPermissionMapper
         - com.yoho.order.dal.ExpressScreenshotsMapper
         - com.yoho.order.dal.ExpressScreenshotsMapper
-        - com.yoho.order.dal.AbnormalExpressMapper
+        - com.yoho.order.dal.AbnormalPackageMapper
 
 
    ufo_resource:
    ufo_resource:
      servers:
      servers: