Просмотр исходного кода

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

anderx 1 год назад
Родитель
Сommit
c43cce5ddf
20 измененных файлов с 1558 добавлено и 1484 удалено
  1. 6 0
      pom.xml
  2. 4 0
      src/main/java/com/goafanti/admin/controller/AdminSuperviserApiController.java
  3. 1 0
      src/main/java/com/goafanti/common/constant/AFTConstants.java
  4. 2 0
      src/main/java/com/goafanti/common/dao/ExpenseRelationshipMapper.java
  5. 1353 1450
      src/main/java/com/goafanti/common/mapper/AdminMapper.xml
  6. 1 1
      src/main/java/com/goafanti/common/mapper/ExpenseAccountMapper.xml
  7. 6 0
      src/main/java/com/goafanti/common/mapper/ExpenseRelationshipMapper.xml
  8. 1 0
      src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml
  9. 21 14
      src/main/java/com/goafanti/common/utils/FileUtils.java
  10. 1 1
      src/main/java/com/goafanti/expenseAccount/Enums/EAsecondaryTypes.java
  11. 62 7
      src/main/java/com/goafanti/expenseAccount/bo/OutExpenseAccountDetailsList.java
  12. 0 1
      src/main/java/com/goafanti/expenseAccount/controller/ExpenseAccountController.java
  13. 9 0
      src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java
  14. 13 0
      src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java
  15. 4 4
      src/main/java/com/goafanti/order/controller/OrderChangeApiController.java
  16. 3 0
      src/main/java/com/goafanti/order/service/OrderNewService.java
  17. 4 4
      src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java
  18. 65 0
      src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java
  19. 1 1
      src/main/resources/props/config_local.properties
  20. 1 1
      src/main/resources/props/config_test.properties

+ 6 - 0
pom.xml

@@ -449,6 +449,12 @@
 			<artifactId>pinyin4j</artifactId>
 			<version>2.5.1</version>
 		</dependency>
+		<dependency>
+			<groupId>com.mchange</groupId>
+			<artifactId>mchange-commons-java</artifactId>
+			<version>0.2.15</version>
+			<scope>compile</scope>
+		</dependency>
 
 	</dependencies>
 	<build>

+ 4 - 0
src/main/java/com/goafanti/admin/controller/AdminSuperviserApiController.java

@@ -89,6 +89,10 @@ public class AdminSuperviserApiController extends CertifyApiController {
 				res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "用户名为空", "用户名"));
 				return res;
 			}
+			if (admin.getExpenseSuperExamine()==null) {
+				res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "报销是否上级审核", "报销是否上级审核"));
+				return res;
+			}
 			Admin a = newAdminService.selectByMobile(admin.getMobile().trim());
 			if (null != a) {
 				res.getError().add(buildError(ErrorConstants.USER_ALREADY_EXIST, "当前用户已注册!"));

+ 1 - 0
src/main/java/com/goafanti/common/constant/AFTConstants.java

@@ -2,6 +2,7 @@ package com.goafanti.common.constant;
 
 public class AFTConstants {
 	public static final String	YYYYMMDDHHMMSS						= "yyyy-MM-dd HH:mm:ss";
+	public static final String	YYYYMMDDHHMM						= "yyyy-MM-dd HH:mm";
 	public static final String	YMDHMS_CHINESE						= "yyyy年MM月dd日 HH:mm:ss";
 	public static final String	YYYYMMDD							= "yyyy-MM-dd";
 	public static final String	YYYYMM								= "yyyy-MM";

+ 2 - 0
src/main/java/com/goafanti/common/dao/ExpenseRelationshipMapper.java

@@ -18,4 +18,6 @@ public interface ExpenseRelationshipMapper {
     int updateByPrimaryKey(ExpenseRelationship record);
 
     List<ExpenseRelationship> selectById(Integer id);
+
+    ExpenseRelationship selectSonId(Integer id);
 }

Разница между файлами не показана из-за своего большого размера
+ 1353 - 1450
src/main/java/com/goafanti/common/mapper/AdminMapper.xml


+ 1 - 1
src/main/java/com/goafanti/common/mapper/ExpenseAccountMapper.xml

@@ -935,7 +935,7 @@
   <select id="ExpenseDetailsList" resultType="com.goafanti.expenseAccount.bo.OutExpenseAccountDetailsList">
     select mea.check_no checkNo ,ead.`type`,ead.type_other typeOther,
            ead.amount ,ead.real_amount realAmount ,o.contract_no contractNo ,dep.name applyDepName,
-    a.id sonId,a.type sonType ,a.type_other sonTypeOther ,
+    a.id sonId,a.type sonType ,a.type_other sonTypeOther ,a.release_start releaseStart ,a.release_end releaseEnd ,a.duration ,ROUND(a.duration/7.5) days,
     dep2.name payDepName ,a.aname ,ad2.name financeName,mea.status ,mea.process_status processStatus ,mea.id mainId,a.target_type targetType,
     tm.buyer_name buyerName ,date_format(mea.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr
     from expense_account_details  ead left join expense_account a on ead.eaid =a.id

+ 6 - 0
src/main/java/com/goafanti/common/mapper/ExpenseRelationshipMapper.xml

@@ -76,4 +76,10 @@
     from expense_relationship
     where id = #{id,jdbcType=INTEGER}
   </select>
+    <select id="selectSonId" resultType="com.goafanti.common.model.ExpenseRelationship">
+      select
+      <include refid="Base_Column_List" />
+      from expense_relationship
+      where ea_id = #{id,jdbcType=INTEGER}
+    </select>
 </mapper>

+ 1 - 0
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -966,6 +966,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   <select id="selectOrderNewListByPage" resultType="com.goafanti.order.bo.TOrderNewBo">
   	select a.order_no as orderNo,a.create_time as createTime, date_format(a.sign_time,'%Y-%m-%d' ) as signDate,a.delete_sign deleteSign,
   	a.contract_no as contractNo, b.nickname as userName ,a.process_status as processStatus,a.total_amount as totalAmount,a.tag,
+  	a.contract_picture_url contractPictureUrl,
   	a.order_status as orderStatus, a.liquidation_status as liquidationStatus,a.approval,c.salesman_name as salesmanName,c.project_type projectType,
   	dep.name as depName,c.finance_name as financeName,c.invoice_amount invoiceAmount,a.settlement_amount settlementAmount,
     a.sales_type salesType, a.channel_id channelId ,a.other,a.examine_name examineName,c.stop_project stopProject

+ 21 - 14
src/main/java/com/goafanti/common/utils/FileUtils.java

@@ -1,23 +1,16 @@
 package com.goafanti.common.utils;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.regex.Pattern;
-
-import javax.servlet.http.HttpServletResponse;
-
+import com.goafanti.common.enums.AttachmentType;
+import com.goafanti.common.error.BusinessException;
+import com.mchange.v1.io.InputStreamUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.multipart.MultipartFile;
 
-import com.goafanti.common.enums.AttachmentType;
-import com.goafanti.common.error.BusinessException;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.net.URLEncoder;
+import java.util.regex.Pattern;
 
 public class FileUtils {
 	@Value(value = "${upload.private.path}")
@@ -333,4 +326,18 @@ public class FileUtils {
 		}
 	}
 
+
+	public static byte[] getBytes(File file) throws IOException {
+		BufferedInputStream var1 = new BufferedInputStream(new FileInputStream(file));
+
+		byte[] var2;
+		try {
+			var2 = InputStreamUtils.getBytes(var1);
+		} finally {
+			InputStreamUtils.attemptClose(var1);
+		}
+
+		return var2;
+	}
+
 }

+ 1 - 1
src/main/java/com/goafanti/expenseAccount/Enums/EAsecondaryTypes.java

@@ -9,7 +9,7 @@ public enum EAsecondaryTypes {
     JTF(1,"交通费"),
     ZSF(2,"住宿费"),
     SNCF(3,"市内车费"),
-    CF(4,"餐"),
+    CF(4,"餐"),
     CCBT(5,"出差补贴"),
     YJZ(6,"预借支"),
     YF(7,"油费"),

+ 62 - 7
src/main/java/com/goafanti/expenseAccount/bo/OutExpenseAccountDetailsList.java

@@ -1,8 +1,10 @@
 package com.goafanti.expenseAccount.bo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.goafanti.common.utils.excel.Excel;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 public class OutExpenseAccountDetailsList {
 
@@ -14,23 +16,29 @@ public class OutExpenseAccountDetailsList {
     private Integer type;
     @Excel(name = "类型")
     private String  typeOther;
+    @Excel(name = "报销时间",width = 26)
+    private String releaseTimeStr;
+    @Excel(name = "工时",width = 5)
+    private Double duration ;
+    @Excel(name = "天数",width = 5)
+    private Integer days;
     private Integer sonId;
     private Integer sonType;
     private String  sonTypeOther;
     /**
      * 金额
      */
-    @Excel(name = "报销金额", scale = 2)
+    @Excel(name = "报销金额", scale = 2,width = 8)
     private BigDecimal amount;
     /**
      * 实付金额
      */
-    @Excel(name = "实报金额", scale = 2)
+    @Excel(name = "实报金额", scale = 2,width = 8)
     private BigDecimal realAmount;
     /**
      * 报销查询编号
      */
-    @Excel(name = "报销编号")
+    @Excel(name = "报销编号",width = 20)
     private String checkNo;
     @Excel(name = "报销至订单")
     private String targetName;
@@ -52,17 +60,17 @@ public class OutExpenseAccountDetailsList {
     /**
      * 状态 0=草稿,1=审核中,2=完成,3=驳回 ,4=撤销
      */
-    @Excel(name = "状态",readConverterExp = "0=草稿,1=审核中,2=完成,3=驳回,4=删除")
+    @Excel(name = "状态",readConverterExp = "0=草稿,1=审核中,2=完成,3=驳回,4=删除",width = 8)
     private Integer status;
     /**
      * 申请公司
      */
-    @Excel(name = "申请公司")
+    @Excel(name = "申请公司",width = 20)
     private String applyDepName;
     /**
      * 支付公司
      */
-    @Excel(name = "支付公司")
+    @Excel(name = "支付公司",width = 20)
     private String payDepName;
     /**
      * 流程状态 0=巴员发起,1=上级审核,2=财务审核,3=总经理审核,4=董事长审核
@@ -79,10 +87,57 @@ public class OutExpenseAccountDetailsList {
     /**
      * 创建时间
      */
-    @Excel(name = "报销时间")
+    @Excel(name = "发起时间")
     private String createTimeStr;
     private Integer targetType;
 
+    private Date releaseStart;
+    private Date releaseEnd;
+
+
+
+    public String getReleaseTimeStr() {
+        return releaseTimeStr;
+    }
+
+    public void setReleaseTimeStr(String releaseTimeStr) {
+        this.releaseTimeStr = releaseTimeStr;
+    }
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh", timezone = "GMT+8")
+    public Date getReleaseStart() {
+        return releaseStart;
+    }
+
+    public void setReleaseStart(Date releaseStart) {
+        this.releaseStart = releaseStart;
+    }
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh", timezone = "GMT+8")
+    public Date getReleaseEnd() {
+        return releaseEnd;
+    }
+
+    public void setReleaseEnd(Date releaseEnd) {
+        this.releaseEnd = releaseEnd;
+    }
+
+    public Double getDuration() {
+        return duration;
+    }
+
+    public void setDuration(Double duration) {
+        this.duration = duration;
+    }
+
+    public Integer getDays() {
+        return days;
+    }
+
+    public void setDays(Integer days) {
+        this.days = days;
+    }
+
     public Integer getSonId() {
         return sonId;
     }

+ 0 - 1
src/main/java/com/goafanti/expenseAccount/controller/ExpenseAccountController.java

@@ -310,7 +310,6 @@ public class ExpenseAccountController extends CertifyApiController {
         String[] split = ids.split(",");
         List<String> list = Arrays.asList(split);
         List<ExpenseAccount> expenseAccounts = expenseAccountService.selectByIds(list);
-
         for (ExpenseAccount e : expenseAccounts) {
             if (e.getStatus()!=0){
                 res.getError().add(buildError(String.format("[%s]编号已经发起,不能重复发起。",e.getId())));

+ 9 - 0
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -371,6 +371,10 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                     e.setTypeOther(String.format("其他(%s)",e.getTypeOther()));
                 }
             }
+            if(e.getReleaseStart()!=null&&e.getReleaseEnd()!=null){
+                e.setReleaseTimeStr(DateUtils.formatDate(e.getReleaseStart(),AFTConstants.YYYYMMDDHHMM)+"~"+DateUtils.formatDate(e.getReleaseEnd(),AFTConstants.YYYYMMDDHHMM));
+            }
+
         }
         NewExcelUtil excelUtil=new NewExcelUtil(OutExpenseAccountDetailsList.class);
         return excelUtil.exportExcel(list,"费用详细列表",uploadPath);
@@ -1038,8 +1042,13 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
 
     @Override
     public Object selectByPrid(InputExpenseAccount in) {
+
         in.setAid(TokenManager.getAdminId());
         OutExpenseAccount useEa = expenseAccountMapper.selectByaidAndPrid(in);
+        ExpenseRelationship er = expenseRelationshipMapper.selectSonId(useEa.getId());
+        if (er!=null){
+            throw new BusinessException("公出已经发起报销");
+        }
         return useEa;
     }
 

+ 13 - 0
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -340,6 +340,19 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	}
 
 	/**
+	 * 		订单列表导出文件
+	 *  specially 0 个人 1 营销员管理 2 驳回 3 特批 4 咨询师管理 5部门订单查询 6客服查询 7统计签单订单 8客户订单列表 9 复审订单 10 营销经理
+	 *  distribution (咨询师管理列表 0 未分配 1部分 2全部
+	 *  amountStatus  0 10万元以下 1 10万~20万 2 20万~30万 3 30万~40万  4 40万以上
+	 * @return
+	 */
+	@RequestMapping(value="/orderNewListDownload", method = RequestMethod.GET)
+	public Result orderNewListDownload(InputOrderNewListBo in,HttpServletResponse response){
+		orderNewService.orderNewListDownload(in,response);
+		return new Result();
+	}
+
+	/**
 	 * 销售来源订单列表
 	 * @param in
 	 * @return

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

@@ -252,11 +252,11 @@ public class OrderChangeApiController extends CertifyApiController {
 	 *  赠送:营销-经理-总经理审核-财务(已收款情况)-总裁
 	 *  重报:营销-经理-总经理审核-技术员-财务-财务总监-总裁
 	 * 	仅项目:营销-经理-总经理审核-技术员-技术总监-财务-财务总监-总裁
-	 *  项目&金额:营销-经理-总经理审核-技术员-经理经理-技术总监-财务-财务总监-总裁
-	 *  退单退款:营销-经理-总经理审核-技术员-经理经理-技术总监-财务-财务总监-总裁-董事长(大于2K,需董事长审核)-财务退票
-	 *  退单不退款:营销-经理-总经理审核-技术员-经理经理-技术总监-财务-财务总监-总裁-财务退票
+	 *  项目&金额:营销-经理-总经理审核-技术员-技术经理-技术总监-财务-财务总监-总裁
+	 *  退单退款:营销-经理-总经理审核-技术员-技术经理-技术总监-财务-财务总监-总裁-董事长(大于2K,需董事长审核)-财务退票
+	 *  退单不退款:营销-经理-总经理审核-技术员-技术经理-技术总监-财务-财务总监-总裁-财务退票
 	 * 	仅金额:营销-经理-总经理审核-技术总监-财务-财务总监-总裁
-	 * 	框架协议审核流程: 营销员发起-营销经理审核-营销管理员审核-财务审核-咨询师管理员审核-完成
+	 * 	框架协议审核流程: 营销员发起-营销经理审核-营销管理员审核-财务审核-完成
 	 */
 	@RequestMapping(value = "/orderChangeAudit", method = RequestMethod.POST)
 	public Result orderChangeAudit(String changeId,String remarks,Integer status,Integer processState,Integer rejectState){

+ 3 - 0
src/main/java/com/goafanti/order/service/OrderNewService.java

@@ -5,6 +5,7 @@ import com.goafanti.common.model.*;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.order.bo.*;
 
+import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
@@ -226,4 +227,6 @@ public interface OrderNewService {
 
 
 	void financeCountOrderUnauditedSubtraction(TOrderNew use, Integer i);
+
+	void orderNewListDownload(InputOrderNewListBo in, HttpServletResponse response);
 }

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

@@ -285,9 +285,9 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 /*				 	 赠送:营销-经理-总经理审核-财务(已收款情况)-总裁(副总裁)
 				 	 重报:营销-经理-总经理审核-技术员-财务-财务总监-总裁(副总裁)
 					仅项目:营销-经理-总经理审核-技术员-技术总监-财务-财务总监-总裁(副总裁)
-				 项目&金额:营销-经理-总经理审核-技术员-经理经理-技术总监-财务-财务总监-总裁(副总裁)
-				  退单退款:营销-经理-总经理审核-技术员-经理经理-技术总监-财务-财务总监-总裁(副总裁)-董事长(副总裁大于2K,需董事长审核)-财务退票
-				 退单不退款:营销-经理-总经理审核-技术员-经理经理-技术总监-财务-财务总监-总裁(副总裁)-财务退票
+				 项目&金额:营销-经理-总经理审核-技术员-技术经理-技术总监-财务-财务总监-总裁(副总裁)
+				  退单退款:营销-经理-总经理审核-技术员-技术经理-技术总监-财务-财务总监-总裁(副总裁)-董事长(副总裁大于2K,需董事长审核)-财务退票
+				 退单不退款:营销-经理-总经理审核-技术员-技术经理-技术总监-财务-财务总监-总裁(副总裁)-财务退票
 					仅金额:营销-经理-总经理审核-技术总监-财务-财务总监-总裁(副总裁)
 				框架协议审核流程: 营销员发起-营销经理审核-营销管理员审核-财务审核
 				 */
@@ -779,7 +779,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 					//如果自己是审核人员则跳过
 					if (flag){
 						date.setTime(date.getTime()+500);
-						addOrderChangeLog("自己是营销管理员自动通过", 2, t.getOrderNo(), noc.getId(),date);
+						addOrderChangeLog("审核人重复自动通过", 2, t.getOrderNo(), noc.getId(),date);
 						noc.setProcessState(OrderChangeProcess.JSY.getCode());
 						if (t.getType()==OrderChangeType.CB.getCode()||
 								t.getType()==OrderChangeType.JXMBG.getCode()||

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

@@ -31,6 +31,7 @@ import com.goafanti.order.service.OrderProjectService;
 import com.goafanti.organization.bo.*;
 import com.goafanti.patent.service.PatentNewService;
 import groovy.transform.Synchronized;
+import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -42,6 +43,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.mail.MessagingException;
+import javax.servlet.http.HttpServletResponse;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
@@ -49,6 +53,8 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
 
 @Service
 @EnableAsync
@@ -1766,6 +1772,65 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		}
 	}
 
+	@Override
+	public void orderNewListDownload(InputOrderNewListBo in,HttpServletResponse response) {
+		in.setPageSize(99999);
+		Pagination<TOrderNewBo> pagination = orderNewList(in);
+		List<TOrderNewBo> list = (List<TOrderNewBo>) pagination.getList();
+		downloadOrderImg( list,  response);
+	}
+
+	public void downloadOrderImg(List<TOrderNewBo> list, HttpServletResponse response){
+			String downloadFileName = "";
+			ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+			ZipOutputStream zip = new ZipOutputStream(outputStream);
+			downloadFileName="订单合同数据.zip";
+			for (TOrderNewBo t : list) {
+				String annexUrl = t.getContractPictureUrl();
+				if (StringUtils.isNotBlank(annexUrl)) {
+					String[] split = annexUrl.split(",");
+					if (split.length>0){
+						int index =0;
+						for (String s : split) {
+							if (StringUtils.isNotEmpty(s)){
+								index++;
+								String url=s.replace("/profile/upload","");
+								url=uploadPath+url;
+								System.out.println(url);
+								File file = new File(url);
+								if (file.exists()){
+									try {
+										String suffix = s.substring(s.indexOf("."));
+										String fileName=t.getUserName()+"("+t.getContractNo()+")"+"/"+t.getContractNo()+"_"+index+suffix;
+										ZipEntry e = new ZipEntry(fileName);
+										zip.putNextEntry(e);
+										IOUtils.write(FileUtils.getBytes(file),zip);
+										zip.closeEntry();
+										zip.flush();
+									} catch (IOException e){
+										throw  new BusinessException("文件写入压缩失败:"+e.getLocalizedMessage());
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+			IOUtils.closeQuietly(zip);
+			try {
+				byte[] data = outputStream.toByteArray();
+				response.reset();
+				response.addHeader("Access-Control-Allow-Origin", "*");
+				response.addHeader("Access-Control-Expose-Headers", "Content-Disposition");
+				response.setHeader("Content-Disposition", "attachment; filename=\"" + java.net.URLEncoder.encode(downloadFileName, "utf-8").replaceAll("\\+", "%20") + "\"");
+				response.addHeader("Content-Length", "" + data.length);
+				response.setContentType("application/octet-stream; charset=UTF-8");
+				IOUtils.write(data,response.getOutputStream());
+			} catch (IOException e) {
+				throw new RuntimeException(e);
+			}
+
+	}
 	private TOrderNew checkDeleteSign(String orderNo) {
 		TOrderNew t=tOrderNewMapper.selectByPrimaryKey(orderNo);
 		//if(t.getDeleteSign()==2) throw new BusinessException(new Error(ErrorConstants.ORDER_ALREADY_REVOKE, t.getOrderNo(),""));

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -51,7 +51,7 @@ yxjl_max=100
 
 amb.maxLvl=6
 
-static.host=//static.jishutao.com/1.3.05
+static.host=//static.jishutao.com/1.3.06
 #static.host=//172.16.1.187/1.3.04
 #avatar.host=//172.16.0.255:3000
 #static.host=//172.16.0.255:3000/1.2.62

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -52,7 +52,7 @@ amb.maxLvl=6
 
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.3.05
+static.host=//static.jishutao.com/1.3.06
 rd.static.host=//static.jishutao.com/RD/1.0.03
 avatar.upload.host=//static.jishutao.com/upload