'1'

zzjs-admin/src/main/resources/application-prod.yml

@@ -123,7 +123,7 @@ wxpay:
 film:
     appKey: 10294472736
     appSecret: n8qV2tsBKN6JQ4nMtycPa8e7
-    notifyUrl: http://admin.zzxcx.net/prod-api/open-api/film/notify/filmOrder
+    notifyUrl: https://admin.zzxcx.net/prod-api/open-api/film/notify/filmOrder
     v1Url: http://movieapi.pintoto.cn/
     v2Url: http://movieapi2.pintoto.cn/
 
@@ -152,4 +152,4 @@ fulu:
     appKey: "qxTK3W/RNleYH5tygePOu52hoFHpaqCi0eR5yKhHVgYQanIcua5edOG2rgrldHnL"
     appSecret: "a1be19d04c724c05971942305ea97489"
     url: "http://openapi.fulu.com"
-    notifyUrl: "http://admin.zzxcx.net/prod-api/open-api/fulu/notify/fuluOrder"
+    notifyUrl: "https://admin.zzxcx.net/prod-api/open-api/fulu/notify/fuluOrder"

zzjs-admin/src/test/java/com/miaxis/test/NormalTest.java

@@ -26,7 +26,7 @@ import java.security.cert.X509Certificate;
 
 import static com.miaxis.common.utils.OrderCodeFactory.getOrderCode;
 
-//@ActiveProfiles("prod")
+@ActiveProfiles("prod")
 @SpringBootTest(classes = ZzjsApplication.class)
 @RunWith(SpringRunner.class)
 public class NormalTest {
@@ -44,8 +44,8 @@ public class NormalTest {
 
     @Test
     public void test1() throws Exception {
-        WxOrder wxOrder = wxOrderService.getByOutTradeNo("12021060816391765454799220937462");
-        WxNotifyReturnDTO refund = refundRecordService.refund(wxOrder, "12021060816391765454799220937463","商品购买失败");
+        WxOrder wxOrder = wxOrderService.getByOutTradeNo("12022020916112987326622703914644");
+        WxNotifyReturnDTO refund = refundRecordService.refund(wxOrder, "12022020916112987326622703914646","商品购买失败");
         System.out.println(JSONObject.toJSONString(refund));
 //        WxOrder wxOrder1 = wxOrderService.getByOutTradeNo("12021052415260767148145493655617");
 //        refundRecordService.refund(wxOrder1,"12021051815333778448136985596489");

zzjs-service/src/main/java/com/miaxis/teachingVideo/mapper/TeachingVideoInfoMapper.java

@@ -53,4 +53,6 @@ public interface TeachingVideoInfoMapper extends BaseMapper<TeachingVideoInfo> {
      * @return
      */
     List<TeachingVideoInfoAppletVo> getTeachingVideoByTypeId(Long typeId);
+
+    List<TeachingVideoInfoAppletVo> selectTeachingVideoInfoListByType();
 }

zzjs-service/src/main/java/com/miaxis/teachingVideo/service/impl/TeachingVideoTypeInfoServiceImpl.java

@@ -107,6 +107,7 @@ public class TeachingVideoTypeInfoServiceImpl extends ServiceImpl<TeachingVideoT
     public Response<List<AppletTeachingVideoTypeInfoVo>> selectAppletTeachingVideoTypeInfoTreeList() {
 
         List<AppletTeachingVideoTypeInfoVo> list = teachingVideoTypeInfoMapper.selectAppletTeachingVideoTypeInfoTreeList();
+        teachingVideoInfoMapper.selectTeachingVideoInfoListByType();
         for (AppletTeachingVideoTypeInfoVo productTypeInfoVo : list) {
             if(!"0".equals(productTypeInfoVo.getPid())){
                 PageHelper.startPage(1, 4, "sort");

zzjs-service/src/main/resources/mapper/teachingVideo/TeachingVideoInfoMapper.xml

@@ -158,5 +158,26 @@
           AND vi.`status` = 0
           order by sort
     </select>
+    <select id="selectTeachingVideoInfoListByType" resultType="com.miaxis.teachingVideo.vo.TeachingVideoInfoAppletVo">
+        select
+            vi.id,
+            vi.title,
+            vi.video_describe,
+            vi.video_duration,
+            vi.video_size,
+            vti.pid,
+            vi.teaching_video_type_id,
+            f1.file_url as fileUrl,
+            f2.file_url as coverFileUrl
+        from teaching_video_info vi
+                 LEFT JOIN file_info f1 on f1.file_id = vi.file_id
+                 LEFT JOIN file_info f2 on f2.file_id = vi.cover_file_id
+                 LEFT JOIN teaching_video_type_info vti ON vti.id = vi.teaching_video_type_id
+        WHERE
+            vi.teaching_video_type_id = #{videoTypeId}
+          AND vi.`shelf_status` = 0
+          AND vi.`status` = 0
+          order by sort
+    </select>
 
-</mapper>
+</mapper>