anderx %!s(int64=2) %!d(string=hai) anos
pai
achega
1ce7dacb9f

+ 1 - 1
src/main/java/com/goafanti/common/dao/TOrderNewMapper.java

@@ -80,5 +80,5 @@ public interface TOrderNewMapper {
 
     List<StatisOrderList>  statisticsOrderList(InputStatistics in);
 
-    List<TOrderNewBo>  matchingOrderNoOrUserName(@Param("orderNo") String orderNo, @Param("userName")String userName);
+    List<UserOrder>  matchingOrderNoOrUserName(@Param("orderNo") String orderNo, @Param("userName")String userName);
 }

+ 1 - 1
src/main/java/com/goafanti/common/dao/TemporaryReceivablesMapper.java

@@ -27,7 +27,7 @@ public interface TemporaryReceivablesMapper {
 
     int deleteByaid(String aid);
 
-    List<TemporaryReceivables> selectByaid(String aid);
+    List<TemporaryReceivables> selectByaid(@Param("aid") String aid,@Param("mergeStatus") Integer mergeStatus);
 
     void deleteNormalByaid(String aid);
 

+ 2 - 2
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -2081,8 +2081,8 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
     </if>
   </select>
 
-  <select id="matchingOrderNoOrUserName" resultType="com.goafanti.order.bo.TOrderNewBo">
-    select order_no orderNo ,buyer_id uid ,b.nickname
+  <select id="matchingOrderNoOrUserName" resultType="com.goafanti.order.bo.UserOrder">
+    select order_no orderNo ,buyer_id uid ,b.nickname userName
     from t_order_new a left join `user` b on a.buyer_id =b.id
     where 1=1
     <if test="orderNo !=null">

+ 3 - 2
src/main/java/com/goafanti/common/mapper/TemporaryReceivablesMapper.xml

@@ -172,11 +172,12 @@
     where aid = #{aid} and status &lt; 2
   </delete>
   <select id="selectByaid" resultMap="BaseResultMap">
-
     select
     <include refid="Base_Column_List" />
     from temporary_receivables
-    where aid = #{aid,jdbcType=INTEGER}
+    where aid = #{aid}
+    and merge_status= #{mergeStatus}
+
   </select>
   <select id="selectReceivablesList" parameterType="java.lang.String" resultType="com.goafanti.order.bo.ReceivablesListBo">
   	 select a.id,a.order_no orderNo,b.contract_no contractNo,a.corporate_name corporateName,c.nickname,

+ 32 - 0
src/main/java/com/goafanti/order/bo/UserOrder.java

@@ -0,0 +1,32 @@
+package com.goafanti.order.bo;
+
+public class UserOrder {
+
+    private String orderNo;
+    private String uid;
+    private String userName;
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public String getUid() {
+        return uid;
+    }
+
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+}

+ 4 - 4
src/main/java/com/goafanti/order/controller/AdminOrderReceivablesApiController.java

@@ -143,11 +143,11 @@ public class AdminOrderReceivablesApiController extends CertifyApiController {
 	 *
 	 */
 	@RequestMapping(value ="/batchImport",method = RequestMethod.POST)
-	public Result batchImport(){
+	public Result batchImport(Integer mergeStatus){
 		LoggerUtils.debug(getClass(), "=========================开始批量导入===================");
 		Result res = new Result();
 		int i=0;
-		i=orderReceivablesService.batchImport();
+		i=orderReceivablesService.batchImport( mergeStatus);
 		if (i==-1) {
 			throw new BusinessException(new Error("未找到正确的回款信息。"));
 		}
@@ -265,7 +265,7 @@ public class AdminOrderReceivablesApiController extends CertifyApiController {
 	 * @param value 匹配数据值
 	 * @return
 	 */
-	@RequestMapping(value = "/matchingOrderNo",method = RequestMethod.POST)
+	@RequestMapping(value = "/matchingOrderNo",method = RequestMethod.GET)
 	public Result matchingOrderNo(String value){
 		Result res=new Result();
 		if (value==null){
@@ -281,7 +281,7 @@ public class AdminOrderReceivablesApiController extends CertifyApiController {
 	 * @param value 匹配数据值
 	 * @return
 	 */
-	@RequestMapping(value = "/matchingUser",method = RequestMethod.POST)
+	@RequestMapping(value = "/matchingUser",method = RequestMethod.GET)
 	public Result matchingUser(String value){
 		Result res=new Result();
 

+ 4 - 3
src/main/java/com/goafanti/order/service/OrderReceivablesService.java

@@ -6,6 +6,7 @@ import java.util.Map;
 
 import com.goafanti.common.model.User;
 import com.goafanti.order.bo.TOrderNewBo;
+import com.goafanti.order.bo.UserOrder;
 import org.springframework.web.multipart.MultipartFile;
 
 import com.goafanti.core.mybatis.page.Pagination;
@@ -22,7 +23,7 @@ public interface OrderReceivablesService {
 
 	int deleteAllReceivables();
 
-	int batchImport();
+	int batchImport(Integer mergeStatus);
 
 
 	void batchListReceivables(MultipartFile file);
@@ -38,7 +39,7 @@ public interface OrderReceivablesService {
 
     int pushWaitingMerge(String ids);
 
-    List<TOrderNewBo> matchingOrderNo(String value);
+    List<UserOrder > matchingOrderNo(String value);
 
-	List<TOrderNewBo> matchingUser(String value);
+	List<UserOrder > matchingUser(String value);
 }

+ 4 - 4
src/main/java/com/goafanti/order/service/impl/OrderReceivablesServiceImpl.java

@@ -107,8 +107,8 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 	}
 	@SuppressWarnings("deprecation")
 	@Override
-	public int batchImport() {
-		List<TemporaryReceivables> list=temporaryReceivablesMapper.selectByaid(TokenManager.getAdminId());
+	public int batchImport(Integer mergeStatus) {
+		List<TemporaryReceivables> list=temporaryReceivablesMapper.selectByaid(TokenManager.getAdminId(),mergeStatus);
 		if(list.size()>99)throw new BusinessException(new Error("数量过大,建议不超过99。"));
 		List<TOrderBillNew> listBull=new ArrayList<>();
 		for (TemporaryReceivables tr : list) {
@@ -580,12 +580,12 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 	}
 
 	@Override
-	public List<TOrderNewBo> matchingOrderNo(String value) {
+	public List<UserOrder> matchingOrderNo(String value) {
 		return tOrderNewMapper.matchingOrderNoOrUserName(value,null);
 	}
 
 	@Override
-	public List<TOrderNewBo> matchingUser(String value) {
+	public List<UserOrder> matchingUser(String value) {
 		return tOrderNewMapper.matchingOrderNoOrUserName(null,value);
 	}