视频功能

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/controller/api/PmController.java

@@ -71,12 +71,20 @@ public class PmController extends ProjBaseAction {
 			List<Map<String, Object>> list = pmItemService.select_list(kid);
 			String shop_id = list.get(0).get("shop_id").toString();
 			t_shop shop = shopService.get(shop_id);
+			//视频
+			String videoFileId = list.get(0).get("video_file_id").toString();
+			result.put("video_file_id", videoFileId);
 			result.put("persion_kid", shop.getPersion_id());
 			List<Map<String, Object>> imgsrclist = new ArrayList<Map<String, Object>>();
 			// 如果没有当前价记录，当前价为起拍价
 			for (Map<String, Object> map : list) {
 				// 循环将图片生成数组
 				String imgstr = map.get("bid_file_id").toString();
+				//视频不为空时，吧视频放入第一个
+				/*if(!"".equals(videoFileId) && videoFileId.length()>0
+						&& videoFileId !=null){
+					imgstr = videoFileId + ","+imgstr;
+				}*/
 				String[] str = imgstr.split(",");
 				for (int i = 0; i < str.length; i++) {
 					Map<String, Object> m = new HashMap<String, Object>();

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/controller_wxapp/WxPmController.java

@@ -12,6 +12,7 @@ import com.ydw.yunbuyer.common.base.enums.TimeEnum;
 import org.apache.http.client.ClientProtocolException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.tmsps.ne4spring.utils.ChkUtil;
@@ -344,19 +345,28 @@ public class WxPmController extends ProjBaseAction {
 			t_shop shop = shopService.get(shop_id);
 			Persion persionDb = persionApi.get(shop.getPersion_id());
 			String avataUrl = persionDb.getAvatarUrl();
+			//视频
+			String videoFileId = list.get(0).get("video_file_id").toString();
 			result.put("persion_kid", shop.getPersion_id());
 			result.put("avataUrl", avataUrl);
+			result.put("video_file_id", videoFileId);
 			List<Map<String, Object>> imgsrclist = new ArrayList<Map<String, Object>>();
 			// 如果没有当前价记录，当前价为起拍价
 			for (Map<String, Object> map : list) {
 				// 循环将图片生成数组
 				String imgstr = map.get("bid_file_id").toString();
+				//视频不为空时，吧视频放入第一个
+				if(!"".equals(videoFileId) && videoFileId.length()>0
+						&& videoFileId !=null){
+					imgstr = videoFileId + ","+imgstr;
+				}
 				String[] str = imgstr.split(",");
 				for (int i = 0; i < str.length; i++) {
 					Map<String, Object> m = new HashMap<String, Object>();
 					m.put("img", str[i]);
 					imgsrclist.add(m);
 				}
+
 			}
 			// 竞价号牌
 			List<Map<String, Object>> list2 = wxPmService.get_bidding_code(kid, persion_id);

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/daoImpl/WxSubmitDaoImpl.java

@@ -168,7 +168,7 @@ public class WxSubmitDaoImpl extends BaseDaoImpl<t_pm_offline_apply> implements
 
 	@Override
 	public t_pm_offline_apply findByUserAndItemId(String item_id, String user_id) {
-		String sql = "select t.* from t_pm_offline_apply t where t.status=0 and (t.pm_item_id=?) and (t.pm_user_id=?) ";
+		String sql = "select t.* from t_pm_offline_apply t where t.status=0 and (t.pm_item_id=?) and (t.pm_user_id=?) ORDER BY created desc LIMIT 1 ";
 		t_pm_offline_apply pm_offline_apply = bs.findObj(t_pm_offline_apply.class, sql,
 				new Object[] { item_id, user_id });
 		return pm_offline_apply;

krock-pm/krock-web-pm/src/main/resources/static/pm/auctioSystemPC/index.html

@@ -25,7 +25,8 @@
             <div class="banner">
                 <div class="layui-carousel" id="test1">
                     <div class="items" carousel-item>
-                        <div ms-for="item in @goodsImgs">
+                        <video ms-if="@videoFileId != ''" ms-attr="{src: @videoFileId}" controls></video>
+                        <div ms-for="(item) in @goodsImgs">
                             <img ms-attr="{src: item}">
                         </div>
                     </div>

krock-pm/krock-web-pm/src/main/resources/static/pm/auctioSystemPC/js/index.js

@@ -20,6 +20,7 @@ $(function () {
         is_opening: false,
         nowtime: '',
         record: [],
+        videoFileId:'',
         goodsImgs: [],
         auctionData: {},
         countDown: '',
@@ -48,7 +49,10 @@ $(function () {
             kid: kid
         },
         success: function (data) {
-            console.log(vm)
+            console.log(data)
+            if (data.video_file_id != ''){
+                vm.videoFileId = '/web-cp-all/img_pm/img/' + data.video_file_id;
+            }
             for (var i = 0; i < data.imgarray.length; i++) {
                 var url = '/web-cp-all/img_pm/img/' + data.imgarray[i].img
                 vm.goodsImgs.push(url)
@@ -193,7 +197,8 @@ $(function () {
 
     // 计算北京时间
     function checkDateTime() {
-        var today = new Date(vm.nowtime);
+        // var today = new Date(vm.nowtime);
+        var today = new Date();
         var month = today.getMonth() + 1;
         var date = today.getDate();
         var year = today.getFullYear();