Browse Source

新增名称、订单编号、金额与收款时间判断。

Signed-off-by: anderx <312518615@qq.com>
anderx 6 years ago
parent
commit
a9e60704f6

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

@@ -88,7 +88,6 @@ public interface TemporaryReceivablesMapper {
 	void deleteNormalByaid(String aid);
 
 
-	List<String> getRepeatOrderNo(List<TemporaryReceivablesBo> list);
 
 	void insertBatch(List<TemporaryReceivablesBo> list);
 
@@ -98,4 +97,6 @@ public interface TemporaryReceivablesMapper {
 
 	String getCountlistReceivablesTotalAmount(Map<String, Object> parameter);
 
+	int selectReceivablesNumberRepeats(TemporaryReceivables tr);
+
 }

+ 7 - 0
src/main/java/com/goafanti/common/mapper/TemporaryReceivablesMapper.xml

@@ -544,4 +544,11 @@
 	where x.order_no=y.order_no and x.amount=y.amount and x.receivables_time=y.receivables_time 
 	and x.corporate_name=y.nickname and x.aid= #{aid}
   </update>
+  <select id="selectReceivablesNumberRepeats"  parameterType="com.goafanti.common.model.TemporaryReceivables" resultType="java.lang.Integer">
+   select  count(*) from t_order_bill_new a left join user b on a.payer_id=b.id
+	where a.order_no= #{orderNo} 
+	and b.nickname= #{corporateName}
+	and a.transaction_amount= #{amount} 
+	and a.financial_pay_time= #{receivablesTime}
+  </select>
 </mapper>

+ 1 - 1
src/main/java/com/goafanti/order/enums/ReceivablesStatus.java

@@ -13,7 +13,7 @@ public enum ReceivablesStatus {
 	DCYC(2,"订单异常"),
 	JEYC(3,"金额异常"),
 	MCYC(4,"名称异常"),
-	WZYC(5,"未知异常");
+	YSK(5,"已收款");
 	
 	private ReceivablesStatus(Integer code, String desc) {
 		this.code = code;

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

@@ -154,7 +154,6 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 			//获取总金额
 			TOrderNewBo t=tOrderNewMapper.getOrderNewDetail(tr.getOrderNo());
 			//订单匹配不到
-			
 			if(t==null||t.getOrderNo()==null) {
 				tr.setStatus(ReceivablesStatus.DCYC.getCode());
 				temporaryReceivablesMapper.updateByPrimaryKeySelective(tr);
@@ -163,11 +162,13 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 				tr.setStatus(ReceivablesStatus.MCYC.getCode());
 				temporaryReceivablesMapper.updateByPrimaryKeySelective(tr);
 				continue;
+			}else if(temporaryReceivablesMapper.selectReceivablesNumberRepeats(tr)>0) {
+				tr.setStatus(ReceivablesStatus.YSK.getCode());
+				temporaryReceivablesMapper.updateByPrimaryKeySelective(tr);
+				continue;
 			}
-				
 			//计算收款结果
 			BigDecimal bd = bill.add(tr.getAmount().abs());
-			
 			//判断表中数据
 			BigDecimal count = new BigDecimal(0).add(bd);
 			for (TOrderBillNew tBill : listBull) {