anderx лет назад: 2
Родитель
Сommit
4f6b010b50

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

@@ -8,6 +8,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Value;
 
 public interface TemporaryReceivablesMapper {
     int deleteByPrimaryKey(Integer id);
@@ -30,5 +31,17 @@ public interface TemporaryReceivablesMapper {
 
     void deleteNormalByaid(String aid);
 
-    int waitngMerge(List<String> list);
+
+
+    void insertBatch(List<TemporaryReceivablesBo> list);
+
+    void updateRepeatOrderNo(String aid);
+
+    String  getCountlistReceivablesAmount(Map<String, Object> parameter);
+
+    String getCountlistReceivablesTotalAmount(Map<String, Object> parameter);
+
+    int selectReceivablesNumberRepeats(TemporaryReceivables tr);
+
+    void waitngMerge(@Value("list") List<Integer> list);
 }

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

@@ -189,8 +189,11 @@
 	<if test="aid != null">
 	and  a.aid= #{aid}
 	</if>
+	<if test="mergeStatus != null">
+    and merge_status = #{mergeStatus}
+    </if>
 	<if test="contractNo != null">
-	b.contract_no like concat('%',#{contractNo},'%')
+	and  b.contract_no like concat('%',#{contractNo},'%')
 	</if>
 	<if test="orderNo != null">
 	and a.order_no = #{orderNo}
@@ -231,8 +234,11 @@
 	<if test="aid != null">
 	and  a.aid= #{aid}
 	</if>
+    <if test="mergeStatus != null">
+    and merge_status = #{mergeStatus}
+    </if>
 	<if test="contractNo != null">
-	b.contract_no like concat('%',#{contractNo},'%')
+	and b.contract_no like concat('%',#{contractNo},'%')
 	</if>
 	<if test="orderNo != null">
 	and a.order_no = #{orderNo}
@@ -369,7 +375,7 @@
 	and a.transaction_amount= #{amount}
 	and a.financial_pay_time= #{receivablesTime}
   </select>
-  <select id="waitngMerge" resultType="java.lang.Integer">
+  <select id="waitngMerge">
     update temporary_receivables
     set merge_Status=1
     where id in

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

@@ -126,13 +126,14 @@ public class AdminOrderReceivablesApiController extends CertifyApiController {
 	}
 
 	@RequestMapping(value ="/listReceivables",method = RequestMethod.GET)
-	public Result listReceivables(ReceivablesListBo rl,Integer status,String adminName,String adminDeps,String orderDeps,Integer pageSize,Integer pageNo){
+	public Result listReceivables(ReceivablesListBo rl,Integer status,String adminName,String adminDeps,String orderDeps,
+								  Integer mergeStatus,Integer pageSize,Integer pageNo){
 		Result res = new Result();
 		Map<String, Object>map =new HashMap<>();
 		//列表数据
-		map.put("pagination", orderReceivablesService.listReceivables(  rl,status,adminName,  adminDeps, orderDeps, pageSize, pageNo));
+		map.put("pagination", orderReceivablesService.listReceivables(  rl,status,adminName,  adminDeps, orderDeps,mergeStatus, pageSize, pageNo));
 		//统计数据
-		map.put("count",orderReceivablesService.getCountlistReceivables(  rl,status,adminName,  adminDeps, orderDeps));
+		map.put("count",orderReceivablesService.getCountlistReceivables(  rl,status,adminName,  adminDeps, orderDeps,mergeStatus));
 		res.data(map);
 		return res;
 	}

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

@@ -24,12 +24,13 @@ public interface OrderReceivablesService {
 
 	void batchListReceivables(MultipartFile file);
 
-	Pagination<ReceivablesListBo> listReceivables(ReceivablesListBo rl,Integer status,String adminName, String adminDeps, String orderDeps, Integer pageSize,
+	Pagination<ReceivablesListBo> listReceivables(ReceivablesListBo rl,Integer status,String adminName, String adminDeps, String orderDeps,
+												  Integer mergeStatus, Integer pageSize,
 			Integer pageNo);
 
 
 	Map<String, Object> getCountlistReceivables(ReceivablesListBo rl, Integer status, String adminName, String adminDeps,
-			String orderDeps);
+			String orderDeps,Integer mergeStatus);
 
 
     int pushWaitingMerge(String ids);

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

@@ -263,12 +263,12 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 	}
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<ReceivablesListBo> listReceivables(ReceivablesListBo rl,Integer status,String adminName, String adminDeps, String orderDeps, Integer pageSize,
-			Integer pageNo) {
+	public Pagination<ReceivablesListBo> listReceivables(ReceivablesListBo rl,Integer status,String adminName, String adminDeps, String orderDeps,
+														 Integer mergeStatus,Integer pageSize, Integer pageNo) {
 		Map<String,Object> parameter=new HashMap<String, Object>();
 		if(pageSize==null||pageSize<1)pageSize=10;
 		if(pageNo==null||pageNo<1)pageNo=1;
-		addParemeter(rl, status, adminName, adminDeps, orderDeps, parameter);
+		addParemeter(rl, status, adminName, adminDeps, orderDeps,mergeStatus, parameter);
 		Pagination<ReceivablesListBo> p=(Pagination<ReceivablesListBo>) findPage("selectReceivablesList", "selectReceivablesCount", parameter, pageNo, pageSize);
 		List<ReceivablesListBo> list=(List<ReceivablesListBo>) p.getList();
 
@@ -289,7 +289,8 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 		return p;
 	}
 
-	private void addParemeter(ReceivablesListBo rl, Integer status, String adminName, String adminDeps, String orderDeps, Map<String, Object> parameter) {
+	private void addParemeter(ReceivablesListBo rl, Integer status, String adminName, String adminDeps, String orderDeps,
+			Integer mergeStatus,Map<String, Object> parameter) {
 		if(StringUtils.isNotBlank(rl.getContractNo())) parameter.put("contractNo", rl.getContractNo());
 		if(StringUtils.isNotBlank(rl.getOrderNo())) parameter.put("orderNo", rl.getOrderNo());
 		if(StringUtils.isNotBlank(rl.getNickname())) parameter.put("nickname", rl.getNickname());
@@ -301,15 +302,16 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 		if(StringUtils.isNotBlank(orderDeps)){
 			parameter.put("orderDeps", departmentService.parseArray(orderDeps));
 		}
-		if(null!= status) parameter.put("status", status);
+		if(null == status) parameter.put("status", status);
+		if(null!= mergeStatus) parameter.put("mergeStatus", mergeStatus);
 		if(StringUtils.isNotBlank(TokenManager.getAdminId())) parameter.put("aid", TokenManager.getAdminId());
 	}
 
 	@Override
 	public Map<String, Object> getCountlistReceivables(ReceivablesListBo rl, Integer status, String adminName,
-			String adminDeps, String orderDeps) {
+			String adminDeps, String orderDeps,Integer mergeStatus) {
 		Map<String,Object> parameter=new HashMap<String, Object>();
-		addParemeter(rl, status, adminName, adminDeps, orderDeps, parameter);
+		addParemeter(rl, status, adminName, adminDeps, orderDeps, mergeStatus, parameter);
 		//计算回收表的订单总金额与当前总收款额。
 		Map<String,Object> map=new HashMap<String, Object>();
 		map.put("totalAmount", new BigDecimal(temporaryReceivablesMapper.getCountlistReceivablesTotalAmount(parameter)).stripTrailingZeros() );
@@ -574,7 +576,12 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 	public int pushWaitingMerge(String ids) {
 		String[] split = ids.split(",");
 		List<String> list= Arrays.asList(split);
-		return temporaryReceivablesMapper.waitngMerge(list);
+		List<Integer> intList=new ArrayList<>();
+		list.forEach(e ->{
+			intList.add(Integer.valueOf(e));
+		});
+		temporaryReceivablesMapper.waitngMerge(intList);
+		return 1;
 	}
 
 }