Procházet zdrojové kódy

Merge branch 'test' of jishutao/kede-server into prod

anderx před 6 roky
rodič
revize
f28577076d

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

@@ -214,14 +214,15 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 						bonus.setBonusSubject(BonusSubject.SF.getCode());//11
 					}
 					lstaus = 1;
-					if(tr.getStatus()==2) {
-						tr.setStatus(0);
-						temporaryReceivablesMapper.updateByPrimaryKeySelective(tr);
-					}
+					
 					addOrderLog(tr.getOrderNo(), OrderLogProcess.CWSF.getCode());
 				}
 			
 			}
+			if(tr.getStatus()==2) {
+				tr.setStatus(0);
+				temporaryReceivablesMapper.updateByPrimaryKeySelective(tr);
+			}
 			//否则新增流水信息
 			tbn.setBillNo(UUID.randomUUID().toString().replaceAll("-", ""));
 			tbn.setCreater(TokenManager.getAdminId());