Browse Source

BUG测试

anderx 6 years ago
parent
commit
fd69fd875a

+ 5 - 4
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -151,7 +151,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/updateServiceOrderNew",method = RequestMethod.POST)
-	public Result updateServiceOrder(TOrderNew t,Integer isSubmit,String signDate){
+	public Result updateServiceOrder(TOrderNew t,String isSubmit,String signDate){
 		Result res = new Result();
 		if(StringUtils.isBlank(t.getOrderNo())){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "订单编号"));
@@ -166,10 +166,11 @@ public class AdminNewOrderApiController extends CertifyApiController {
 			return res;
 		}
 		if(null==isSubmit){
-			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "提状态"));
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "提状态"));
 			return res;
 		}
-		if (isSubmit==1) {
+		int i=Integer.valueOf(isSubmit);
+		if (i==1) {
 			if (orderNewService.checkORderTask(t.getOrderNo())) {
 				res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "主项目"));
 				return res;
@@ -188,7 +189,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 				e.printStackTrace();
 			}
 		}
-		res.setData(orderNewService.updateServiceOrder(t,isSubmit));
+		res.setData(orderNewService.updateServiceOrder(t,i));
 		return res;
 	}
 	

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

@@ -16,13 +16,11 @@ import javax.mail.MessagingException;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.apache.xmlbeans.impl.xb.xsdschema.Public;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import com.alibaba.fastjson.JSON;
 import com.goafanti.admin.bo.AdminListBo;
@@ -52,7 +50,6 @@ import com.goafanti.common.model.TOrderBack;
 import com.goafanti.common.model.TOrderDun;
 import com.goafanti.common.model.TOrderLog;
 import com.goafanti.common.model.TOrderNew;
-import com.goafanti.common.model.TOrderRefund;
 import com.goafanti.common.model.TOrderRefundWithBLOBs;
 import com.goafanti.common.model.TOrderTask;
 import com.goafanti.common.utils.ExportExcelUtil;
@@ -81,7 +78,6 @@ import com.goafanti.order.enums.TaskState;
 import com.goafanti.order.enums.refundState;
 import com.goafanti.order.service.OrderNewService;
 import com.goafanti.order.service.OrderService;
-import com.mysql.fabric.xmlrpc.base.Data;
 
 @Service
 public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> implements OrderNewService {