소스 검색

公出问题修改

anderx 1 년 전
부모
커밋
9bf6fc73ec

+ 1 - 1
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -691,7 +691,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		BigDecimal res=BigDecimal.ZERO;
 		int status=1;
 		if (t.getTotalAmount().compareTo(BigDecimal.valueOf(1)) < 0) {
-
+			res=BigDecimal.ZERO;
 		} else if (t.getTotalAmount().compareTo(BigDecimal.valueOf(3))<0) {
 			res=BigDecimal.valueOf(15);
 

+ 2 - 1
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -400,6 +400,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				}else {
 					in.setTechStartProcess(1);
 				}
+			}else {
+				in.setTechStartProcess(0);
 			}
 			if (in.getUids()!=null){
 				List<String> split = Arrays.asList(in.getUids().split(","));
@@ -411,7 +413,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			in.setUpdateStatus(1);
 			//如果是业务切公出则撤销营销审核与审核人
 			pushUpdateType(in,use);
-
 			//如果是业务公出,切审核状态为其他,则重置审核
 			if(in.getType()==0&&(use.getPublicType()==2||use.getPublicType()==3)){
 				in.setPublicType(1);