bug修复

fs-admin/src/main/java/com/fs/his/task/Task.java

@@ -313,7 +313,7 @@ public class Task {
                     }
                     fastGptPushTotal.setCount(BigDecimal.valueOf(count).multiply(multiple).setScale(0, RoundingMode.UP).longValue());
                     // 计算金额,1元 = 10万token
-                    double amount = count / 100000.0;
+                    double amount = fastGptPushTotal.getCount() / 100000.0;
                     fastGptPushTotal.setAmount(Math.round(amount * 100.0) / 100.0);
 
                     FastGptPushTokenTotal pushTotal = qwRestrictionPushRecordMapper.selectFastGptPushTokenTotalByInfo(fastGptPushTotal);

fs-service/src/main/java/com/fs/course/domain/FsCourseWatchLog.java

@@ -96,6 +96,7 @@ public class FsCourseWatchLog extends BaseEntity
     private Integer watchType;//看课方式：1 app  2 小程序
 
     /** 群聊ID */
+    @Excel(name = "群聊ID")
     private String chatId;
 
 }

fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreOrderScrmMapper.java

@@ -520,7 +520,7 @@ public interface FsStoreOrderScrmMapper
     List<FsStoreOrderTuiVO> selectFsStoreOrderTuiListVO(String userId);
     @Select({"<script> " +
             "select ifnull(count(1),0) from fs_store_order_scrm o  " +
-            "where o.user_id=#{uid} and o.package_id=#{packageId} and o.status &lt;&gt; -3 " +
+            "where o.user_id=#{uid} and o.package_id=#{packageId} and o.status &gt; 0 and o.paid = 1 " +
             "</script>"})
     int checkPackageOrderCount(@Param("uid") long uid, @Param("packageId")String packageId);
     @Select({"<script> " +

fs-service/src/main/java/com/fs/live/service/impl/LiveOrderServiceImpl.java

@@ -3612,7 +3612,7 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
         if(goods == null) return R.error("当前商品不存在");
         if(fsStoreProduct == null) return R.error("商品不存在，购买失败");
         if(fsStoreProduct.getIsShow() == 0 || goods.getStatus() == 0) return R.error("商品已下架，购买失败");
-        if(!"1".equals(fsStoreProduct.getIsAudit()) ) return R.error("商品已下架，购买失败");
+//        if(!"1".equals(fsStoreProduct.getIsAudit()) ) return R.error("商品已下架，购买失败");
         if(liveOrder.getTotalNum() == null || StringUtils.isEmpty(liveOrder.getTotalNum())) liveOrder.setTotalNum("1");
         if(goods.getStock() == null) return R.error("直播间商品库存不足");
         if(fsStoreProduct.getStock() < Integer.parseInt(liveOrder.getTotalNum()) || goods.getStock() < Integer.parseInt(liveOrder.getTotalNum())) return R.error("抱歉，这款商品已被抢光，暂时无库存～");

fs-service/src/main/resources/mapper/course/FsCourseWatchLogMapper.xml

@@ -28,12 +28,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="periodId"    column="period_id"    />
         <result property="watchType"    column="watch_type"    />
         <result property="appId"    column="app_id"    />
+        <result property="chatId"    column="chat_id"    />
     </resultMap>
 
     <sql id="selectFsCourseWatchLogVo">
         select log_id, user_id,finish_time,send_finish_msg,sop_id,video_id,reward_type, log_type, create_time,
                update_time, qw_external_contact_id, duration, qw_user_id, company_user_id, company_id, course_id,
-               camp_period_time,project,period_id,watch_type,app_id  from fs_course_watch_log
+               camp_period_time,project,period_id,watch_type,app_id,chat_id  from fs_course_watch_log
     </sql>
 
     <select id="selectFsCourseWatchLogList" parameterType="FsCourseWatchLog" resultMap="FsCourseWatchLogResult">