Kezdőlap Felfedezés Súgó
Bejelentkezés
caimei365
/
caimei365-manager
3
0
Másolás 0
Fájlok Problémák 0 Beolvasztási kérések 0 Wiki
Forráskód Böngészése

bug fix

Aslee 3 éve
szülő
02c275510b
commit
87676df1d6
14 módosított fájl, 35 hozzáadás és 12 törlés
Egyesített Nézet Diff Statisztika Mutatása
  1. 18 0
      src/main/java/com/caimei/modules/archive/entity/CmProductArchiveContent.java
  2. 1 1
      src/main/java/com/caimei/modules/archive/service/CmProductArchiveContentService.java
  3. 2 0
      src/main/java/com/caimei/modules/archive/utils/FFMPEG.java
  4. 1 1
      src/main/resources/config/beta/caimei.properties
  5. 2 1
      src/main/resources/mappings/modules/archive/CmProductArchiveContentMapper.xml
  6. 2 1
      src/main/resources/mappings/modules/hehe/HeHeNewOrderMapper.xml
  7. 2 2
      src/main/webapp/WEB-INF/views/modules/archive/cmProductArchiveContentList.jsp
  8. 1 0
      src/main/webapp/WEB-INF/views/modules/archive/previewFilePage.jsp
  9. 1 1
      src/main/webapp/WEB-INF/views/modules/bulkpurchase/applyRefoundForm.jsp
  10. 1 1
      src/main/webapp/WEB-INF/views/modules/bulkpurchase/orderConfirmReturnRecord.jsp
  11. 1 1
      src/main/webapp/WEB-INF/views/modules/bulkpurchase/orderReturnRecord.jsp
  12. 1 1
      src/main/webapp/WEB-INF/views/modules/bulkpurchase/orderReviewReturnRecord.jsp
  13. 1 1
      src/main/webapp/WEB-INF/views/modules/bulkpurchase/refundRecord.jsp
  14. 1 1
      src/main/webapp/WEB-INF/views/modules/hehe/heheNewOrderDetail.jsp

+ 18 - 0
src/main/java/com/caimei/modules/archive/entity/CmProductArchiveContent.java
Fájl Megtekintése 

@@ -27,6 +27,8 @@ public class CmProductArchiveContent extends DataEntity<CmProductArchiveContent>
 
 	private String fileName;		//文件名称
 
 	private String fileName;		//文件名称
 
 	private Date uploadTime;		//上传时间
 
 	private Date uploadTime;		//上传时间
 
 	private String fileUrl;			//文件链接
 
 	private String fileUrl;			//文件链接
 
+	private String ossUrl;			//oss链接
 
+	private String waterOssUrl;			//水印图片oss链接
 
 
 
 	public CmProductArchiveContent() {
 
 	public CmProductArchiveContent() {
 
 		super();
 
 		super();
 
@@ -117,4 +119,20 @@ public class CmProductArchiveContent extends DataEntity<CmProductArchiveContent>
 
 	public void setUploadTime(Date uploadTime) {
 
 	public void setUploadTime(Date uploadTime) {
 
 		this.uploadTime = uploadTime;
 
 		this.uploadTime = uploadTime;
 
 	}
 
 	}
 
+
 
+	public String getOssUrl() {
 
+		return ossUrl;
 
+	}
 
+
 
+	public void setOssUrl(String ossUrl) {
 
+		this.ossUrl = ossUrl;
 
+	}
 
+
 
+	public String getWaterOssUrl() {
 
+		return waterOssUrl;
 
+	}
 
+
 
+	public void setWaterOssUrl(String waterOssUrl) {
 
+		this.waterOssUrl = waterOssUrl;
 
+	}
 
 }
 
 }

+ 1 - 1
src/main/java/com/caimei/modules/archive/service/CmProductArchiveContentService.java
Fájl Megtekintése 

@@ -165,7 +165,7 @@ public class CmProductArchiveContentService extends CrudService<CmProductArchive
 
 			logger.info(">>>>>>>>>>>>>>>>>" + waterMarkUrl);
 
 			logger.info(">>>>>>>>>>>>>>>>>" + waterMarkUrl);
 
 			//删除本地文件
 
 			//删除本地文件
 
 			OssArchiveUtil.deleteFile(file);
 
 			OssArchiveUtil.deleteFile(file);
 
-//			OssArchiveUtil.deleteFile(waterMarkFile);
 
+			OssArchiveUtil.deleteFile(waterMarkFile);
 
 			//保存关联关系
 
 			//保存关联关系
 
 			CmProductArchiveFile archiveFile = new CmProductArchiveFile();
 
 			CmProductArchiveFile archiveFile = new CmProductArchiveFile();
 
 			archiveFile.setFileName(fileName);
 
 			archiveFile.setFileName(fileName);

+ 2 - 0
src/main/java/com/caimei/modules/archive/utils/FFMPEG.java
Fájl Megtekintése 

@@ -165,6 +165,8 @@ public class FFMPEG {
 
             String logoPath = classPathResource.getURL().toString();
 
             String logoPath = classPathResource.getURL().toString();
 
             if (!StringUtils.isEmpty(logoPath) && logoPath.startsWith("file:/D:")) {
 
             if (!StringUtils.isEmpty(logoPath) && logoPath.startsWith("file:/D:")) {
 
                 logoPath = logoPath.replace("file:/D", "D\\\\");
 
                 logoPath = logoPath.replace("file:/D", "D\\\\");
 
+            } else {
 
+                logoPath = logoPath.replace("file:", "");
 
             }
 
             }
 
             dto.put("logo", logoPath);
 
             dto.put("logo", logoPath);
 
             logger.info("视频水印图片路径:"+logoPath);
 
             logger.info("视频水印图片路径:"+logoPath);

+ 1 - 1
src/main/resources/config/beta/caimei.properties
Fájl Megtekintése 

@@ -185,4 +185,4 @@ aliyun.endpoint=https://oss-cn-shenzhen.aliyuncs.com
 
 #商品资料库文件临时路径
 
 #商品资料库文件临时路径
 
 archive.tempPath=/mnt/newdatadrive/data/runtime/tomcat-instance/manager/tempFile/
 
 archive.tempPath=/mnt/newdatadrive/data/runtime/tomcat-instance/manager/tempFile/
 
 #ffmpeg路径
 
 #ffmpeg路径
 
-ffmpeg.path=/mnt/newdatadrive/apps/ffmpeg/ffmpeg-app/bin/ffmpeg
 
+ffmpeg.path=/mnt/newdatadrive/apps/ffmpeg/ffmpeg-master/bin/ffmpeg

+ 2 - 1
src/main/resources/mappings/modules/archive/CmProductArchiveContentMapper.xml
Fájl Megtekintése 

@@ -11,7 +11,8 @@
 
 		cf.waterOssName as ossName,
 
 		cf.waterOssName as ossName,
 
 		cf.fileName,
 
 		cf.fileName,
 
 		cf.uploadTime,
 
 		cf.uploadTime,
 
-		cf.ossUrl
 
+		cf.ossUrl,
 
+		cf.waterOssUrl
 
 	</sql>
 
 	</sql>
 
 	
 	
 	<sql id="cmProductArchiveContentJoins">
 
 	<sql id="cmProductArchiveContentJoins">

+ 2 - 1
src/main/resources/mappings/modules/hehe/HeHeNewOrderMapper.xml
Fájl Megtekintése 

@@ -53,7 +53,8 @@
 
 		a.promotionalGiftsCount AS promotionalGiftsCount,
 
 		a.promotionalGiftsCount AS promotionalGiftsCount,
 
 		a.affirmPaymentFlag AS affirmPaymentFlag,
 
 		a.affirmPaymentFlag AS affirmPaymentFlag,
 
 		a.rebateFlag AS rebateFlag,
 
 		a.rebateFlag AS rebateFlag,
 
-		a.zeroCostFlag AS zeroCostFlag
 
+		a.zeroCostFlag AS zeroCostFlag,
 
+        a.couponAmount
 
 	</sql>
 
 	</sql>
 
 
 
     <select id="get" resultType="newOrder">
 
     <select id="get" resultType="newOrder">

+ 2 - 2
src/main/webapp/WEB-INF/views/modules/archive/cmProductArchiveContentList.jsp
Fájl Megtekintése 

@@ -144,8 +144,8 @@
 
 		var title = "视频播放";
 
 		var title = "视频播放";
 
 		top.$.jBox("iframe:" + url, {
 
 		top.$.jBox("iframe:" + url, {
 
 			iframeScrolling: 'yes',
 
 			iframeScrolling: 'yes',
 
-			width: 800,
 
-			height: 300,
 
+			width: 1000,
 
+			height: 800,
 
 			persistent: true,
 
 			persistent: true,
 
 			title: title,
 
 			title: title,
 
 			buttons: {"关闭": '-1'}
 
 			buttons: {"关闭": '-1'}

+ 1 - 0
src/main/webapp/WEB-INF/views/modules/archive/previewFilePage.jsp
Fájl Megtekintése 

@@ -6,6 +6,7 @@
 
     <meta name="decorator" content="default"/>
 
     <meta name="decorator" content="default"/>
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
+abc
 
 <video src="${url}"/>
 
 <video src="${url}"/>
 
 </body>
 
 </body>
 
 </html>
 
 </html>

+ 1 - 1
src/main/webapp/WEB-INF/views/modules/bulkpurchase/applyRefoundForm.jsp
Fájl Megtekintése 

@@ -362,7 +362,7 @@
 
                     </c:if>
 
                     </c:if>
 
                 </c:if>
 
                 </c:if>
 
                 <c:if test="${not empty order.heheCouponRecord}">
 
                 <c:if test="${not empty order.heheCouponRecord}">
 
-                    <a href="${ctx}/hehe/coupon/receiveDetails?userId=${order.userID}">
 
+                    <a href="${ctx}/hehe/cmHeheCoupon/receiveDetails?userId=${order.userID}">
 
                         <font color="red">
 
                         <font color="red">
 
                             （${order.heheCouponRecord.couponType eq 1 ? '活动':order.heheCouponRecord.couponType eq 2?'专享':order.heheCouponRecord.couponType eq 3?'新人':order.heheCouponRecord.couponType eq 4?'好友分享':'好友消费'}券抵扣￥${order.heheCouponRecord.couponAmount}，满${order.heheCouponRecord.touchPrice}减${order.heheCouponRecord.couponAmount}）
 
                             （${order.heheCouponRecord.couponType eq 1 ? '活动':order.heheCouponRecord.couponType eq 2?'专享':order.heheCouponRecord.couponType eq 3?'新人':order.heheCouponRecord.couponType eq 4?'好友分享':'好友消费'}券抵扣￥${order.heheCouponRecord.couponAmount}，满${order.heheCouponRecord.touchPrice}减${order.heheCouponRecord.couponAmount}）
 
                         </font>
 
                         </font>

+ 1 - 1
src/main/webapp/WEB-INF/views/modules/bulkpurchase/orderConfirmReturnRecord.jsp
Fájl Megtekintése 

@@ -263,7 +263,7 @@
 
                 </c:if>
 
                 </c:if>
 
             </c:if>
 
             </c:if>
 
             <c:if test="${not empty order.heheCouponRecord}">
 
             <c:if test="${not empty order.heheCouponRecord}">
 
-                <a href="${ctx}/hehe/coupon/receiveDetails?userId=${order.userID}">
 
+                <a href="${ctx}/hehe/cmHeheCoupon/receiveDetails?userId=${order.userID}">
 
                     <font color="red">
 
                     <font color="red">
 
                         （${order.heheCouponRecord.couponType eq 1 ? '活动':order.heheCouponRecord.couponType eq 2?'专享':order.heheCouponRecord.couponType eq 3?'新人':order.heheCouponRecord.couponType eq 4?'好友分享':'好友消费'}券抵扣￥${order.heheCouponRecord.couponAmount}，满${order.heheCouponRecord.touchPrice}减${order.heheCouponRecord.couponAmount}）
 
                         （${order.heheCouponRecord.couponType eq 1 ? '活动':order.heheCouponRecord.couponType eq 2?'专享':order.heheCouponRecord.couponType eq 3?'新人':order.heheCouponRecord.couponType eq 4?'好友分享':'好友消费'}券抵扣￥${order.heheCouponRecord.couponAmount}，满${order.heheCouponRecord.touchPrice}减${order.heheCouponRecord.couponAmount}）
 
                     </font>
 
                     </font>

+ 1 - 1
src/main/webapp/WEB-INF/views/modules/bulkpurchase/orderReturnRecord.jsp
Fájl Megtekintése 

@@ -373,7 +373,7 @@
 
                         </c:if>
 
                         </c:if>
 
                     </c:if>
 
                     </c:if>
 
                     <c:if test="${not empty order.heheCouponRecord}">
 
                     <c:if test="${not empty order.heheCouponRecord}">
 
-                        <a href="${ctx}/hehe/coupon/receiveDetails?userId=${order.userID}">
 
+                        <a href="${ctx}/hehe/cmHeheCoupon/receiveDetails?userId=${order.userID}">
 
                             <font color="red">
 
                             <font color="red">
 
                                 （${order.heheCouponRecord.couponType eq 1 ? '活动':order.heheCouponRecord.couponType eq 2?'专享':order.heheCouponRecord.couponType eq 3?'新人':order.heheCouponRecord.couponType eq 4?'好友分享':'好友消费'}券抵扣￥${order.heheCouponRecord.couponAmount}，满${order.heheCouponRecord.touchPrice}减${order.heheCouponRecord.couponAmount}）
 
                                 （${order.heheCouponRecord.couponType eq 1 ? '活动':order.heheCouponRecord.couponType eq 2?'专享':order.heheCouponRecord.couponType eq 3?'新人':order.heheCouponRecord.couponType eq 4?'好友分享':'好友消费'}券抵扣￥${order.heheCouponRecord.couponAmount}，满${order.heheCouponRecord.touchPrice}减${order.heheCouponRecord.couponAmount}）
 
                             </font>
 
                             </font>

+ 1 - 1
src/main/webapp/WEB-INF/views/modules/bulkpurchase/orderReviewReturnRecord.jsp
Fájl Megtekintése 

@@ -343,7 +343,7 @@
 
                 </c:if>
 
                 </c:if>
 
             </c:if>
 
             </c:if>
 
             <c:if test="${not empty order.heheCouponRecord}">
 
             <c:if test="${not empty order.heheCouponRecord}">
 
-                <a href="${ctx}/hehe/coupon/receiveDetails?userId=${order.userID}">
 
+                <a href="${ctx}/hehe/cmHeheCoupon/receiveDetails?userId=${order.userID}">
 
                     <font color="red">
 
                     <font color="red">
 
                         （${order.heheCouponRecord.couponType eq 1 ? '活动':order.heheCouponRecord.couponType eq 2?'专享':order.heheCouponRecord.couponType eq 3?'新人':order.heheCouponRecord.couponType eq 4?'好友分享':'好友消费'}券抵扣￥${order.heheCouponRecord.couponAmount}，满${order.heheCouponRecord.touchPrice}减${order.heheCouponRecord.couponAmount}）
 
                         （${order.heheCouponRecord.couponType eq 1 ? '活动':order.heheCouponRecord.couponType eq 2?'专享':order.heheCouponRecord.couponType eq 3?'新人':order.heheCouponRecord.couponType eq 4?'好友分享':'好友消费'}券抵扣￥${order.heheCouponRecord.couponAmount}，满${order.heheCouponRecord.touchPrice}减${order.heheCouponRecord.couponAmount}）
 
                     </font>
 
                     </font>

+ 1 - 1
src/main/webapp/WEB-INF/views/modules/bulkpurchase/refundRecord.jsp
Fájl Megtekintése 

@@ -187,7 +187,7 @@
 
                 </c:if>
 
                 </c:if>
 
             </c:if>
 
             </c:if>
 
             <c:if test="${not empty order.heheCouponRecord}">
 
             <c:if test="${not empty order.heheCouponRecord}">
 
-                <a href="${ctx}/hehe/coupon/receiveDetails?userId=${order.userID}">
 
+                <a href="${ctx}/hehe/cmHeheCoupon/receiveDetails?userId=${order.userID}">
 
                     <font color="red">
 
                     <font color="red">
 
                         （${order.heheCouponRecord.couponType eq 1 ? '活动':order.heheCouponRecord.couponType eq 2?'专享':order.heheCouponRecord.couponType eq 3?'新人':order.heheCouponRecord.couponType eq 4?'好友分享':'好友消费'}券抵扣￥${order.heheCouponRecord.couponAmount}，满${order.heheCouponRecord.touchPrice}减${order.heheCouponRecord.couponAmount}）
 
                         （${order.heheCouponRecord.couponType eq 1 ? '活动':order.heheCouponRecord.couponType eq 2?'专享':order.heheCouponRecord.couponType eq 3?'新人':order.heheCouponRecord.couponType eq 4?'好友分享':'好友消费'}券抵扣￥${order.heheCouponRecord.couponAmount}，满${order.heheCouponRecord.touchPrice}减${order.heheCouponRecord.couponAmount}）
 
                     </font>
 
                     </font>

+ 1 - 1
src/main/webapp/WEB-INF/views/modules/hehe/heheNewOrderDetail.jsp
Fájl Megtekintése 

@@ -195,7 +195,7 @@
 
         <td>
 
         <td>
 
             订单金额：<fmt:formatNumber value="${order.payTotalFee}" type="currency"/>
 
             订单金额：<fmt:formatNumber value="${order.payTotalFee}" type="currency"/>
 
             <c:if test="${not empty order.heheCouponRecord}">
 
             <c:if test="${not empty order.heheCouponRecord}">
 
-                <a href="${ctx}/hehe/coupon/receiveDetails?userId=${order.userID}">
 
+                <a href="${ctx}/hehe/cmHeheCoupon/receiveDetails?userId=${order.userID}">
 
                     <font color="red">
 
                     <font color="red">
 
                         （${order.heheCouponRecord.couponType eq 1 ? '活动':order.heheCouponRecord.couponType eq 2?'专享':order.heheCouponRecord.couponType eq 3?'新人':order.heheCouponRecord.couponType eq 4?'好友分享':'好友消费'}券抵扣￥${order.heheCouponRecord.couponAmount}，满${order.heheCouponRecord.touchPrice}减${order.heheCouponRecord.couponAmount}）
 
                         （${order.heheCouponRecord.couponType eq 1 ? '活动':order.heheCouponRecord.couponType eq 2?'专享':order.heheCouponRecord.couponType eq 3?'新人':order.heheCouponRecord.couponType eq 4?'好友分享':'好友消费'}券抵扣￥${order.heheCouponRecord.couponAmount}，满${order.heheCouponRecord.touchPrice}减${order.heheCouponRecord.couponAmount}）
 
                     </font>
 
                     </font>