需求 #17427

src/main/java/com/egolm/shop/api/service/impl/OrderServiceImpl.java

@@ -1848,8 +1848,10 @@ public class OrderServiceImpl implements OrderService {
 							 params.put("come_from",come_from);
 							 params.put("agentID",agentID); 
 							 params.put("onlinePayTypeId", PayTypeID);
-							  
-							 for(int ii = 1;ii<=100;ii++) {
+							 
+							 boolean isPay_170_flag = false; //170分账是否支付成功，true为成功，false为失败
+							 String statusName ="";
+							 for(int ii = 1;ii<=100;ii++) {  //需求 #17427   失败了遍历100次， 
 								 logger.info("第:{} 次进行扫呗分账支付 ,请求:{} ",ii,payObj.toString());
 								 
 								 String cbkResult = payClient.post("/lcsw/fz_cbk_dotrans_f",  params,map.get("trace_id")+"");
@@ -1864,10 +1866,11 @@ public class OrderServiceImpl implements OrderService {
 										
 										String returnStr = GsonUtil.toJson(returnMap);
 										logger.info("第:{} 次进行扫呗分账支付成功 ,回写结果:{} ",ii,returnStr);
+										isPay_170_flag = true;
 										break;
 								 }else {
 									
-									 String statusName = cbkJsonResult.containsKey("err_code_des")?cbkJsonResult.getString("err_code_des"):cbkJsonResult.getString("message");
+									   statusName = cbkJsonResult.containsKey("err_code_des")?cbkJsonResult.getString("err_code_des"):cbkJsonResult.getString("message");
 										if(StringUtil.isBlank(statusName)) {
 											statusName = "分账支付失败.";
 										}
@@ -1879,6 +1882,13 @@ public class OrderServiceImpl implements OrderService {
 								 }
 							 }
 							 
+							 if(!isPay_170_flag) { //如果100次后还是失败，则订单转为待取消
+								 String csql = "exec up_CancelledSalesOrder '"+salesOrderID+"', 0, '"+statusName+"'"; 
+								 List<Map<String, Object>> returnMap  = jdbcTemplate.executeMutil(csql).getDatas().get(0);
+								 String returnStr = GsonUtil.toJson(returnMap);
+								 logger.info("订单:{} 扫呗分账支付失败 ,订单转为待取消:{}",salesOrderID,returnStr);
+							 }
+							 
 						}else {
 							payObj.putAll(jdbcTemplate.queryForMap(sqlOrderQuery, salesOrderID));
 							return Rjx.jsonOk().setData(payObj).toJson();
@@ -1891,7 +1901,7 @@ public class OrderServiceImpl implements OrderService {
 					String sql111 = "exec up_B2BSalesOrderPayCallBack '" + salesOrderID + "'";
 					List<Map<String, Object>> returnMap  = jdbcTemplate.executeMutil(sql111).getDatas().get(0);
 					Map<String,Object> orderMap = returnMap.get(0);
-					logger.info("订单单号 ："+salesOrderID+" 检查是否要推送蔬东坡-------"+GsonUtil.toJson(returnMap));
+					logger.info("订单单号 ："+salesOrderID+" 存在分账支付检查是否要推送蔬东坡-------"+GsonUtil.toJson(returnMap));
   					String IsPush = orderMap.get("IsPush")+"";
 					if(IsPush.equals("1")) {
 						this.doPushOrderToSdongPo(salesOrderID,IsPush,"0");