1、 直播间-抽奖-后台配置的抽奖商品和显示的不一致

	2、 直播间-抽奖-中奖记录的状态以及 可以重复下单的bug
	3、去掉授权key的权限

fs-admin/src/main/java/com/fs/qw/controller/QwUserController.java

@@ -309,7 +309,6 @@ public class QwUserController extends BaseController {
     /**
      * 直接授权key
      */
-    @PreAuthorize("@ss.hasPermi('qw:user:authAppKey')")
     @PostMapping("/authAppKey")
     public R authAppKey(@RequestBody QwUser param){
         return qwUserService.authAppKey(param);
@@ -318,7 +317,6 @@ public class QwUserController extends BaseController {
     /**
      * 输入授权key
      */
-    @PreAuthorize("@ss.hasPermi('qw:user:authAppKey')")
     @PostMapping("/handleInputAuthAppKey")
     public R handleInputAuthAppKey(@RequestBody QwUser param){
         return qwUserService.handleInputAuthAppKey(param);

fs-company/src/main/java/com/fs/company/controller/qw/QwUserController.java

@@ -296,7 +296,6 @@ public class QwUserController extends BaseController
     /**
     * 直接授权key
     */
-    @PreAuthorize("@ss.hasPermi('qw:user:authAppKey')")
     @PostMapping("/authAppKey")
     public R authAppKey(@RequestBody QwUser param){
         return qwUserService.authAppKey(param);
@@ -305,7 +304,6 @@ public class QwUserController extends BaseController
     /**
      * 输入授权key
      */
-    @PreAuthorize("@ss.hasPermi('qw:user:authAppKey')")
     @PostMapping("/handleInputAuthAppKey")
     public R handleInputAuthAppKey(@RequestBody QwUser param){
         return qwUserService.handleInputAuthAppKey(param);

fs-service/src/main/java/com/fs/live/mapper/LiveLotteryConfMapper.java

@@ -104,8 +104,7 @@ public interface LiveLotteryConfMapper {
 
     @Select("select lulr.*,fu.nickname as user_name,fsp.product_name as product_name\n" +
             "        from live_user_lottery_record lulr left join fs_user fu on lulr.user_id = fu.user_id\n" +
-            "        left join live_goods lg on lulr.product_id = lg.goods_id\n" +
-            "        left join fs_store_product_scrm fsp on lg.product_id = fsp.product_id\n" +
+            "        left join fs_store_product_scrm fsp on lulr.product_id = fsp.product_id \n" +
             "        where lulr.user_id = #{userId}")
     List<LiveUserLotteryRecordVo> selectLiveUserLotteryRecordByUserId(long userId);
 }

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

@@ -2297,6 +2297,9 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
                         OrderLogEnum.CREATE_ORDER.getDesc());
 
                 // 设置直播订单的 orderId 为商城订单的 id
+                liveUserLotteryRecord.setOrderId(storeOrder.getId());
+                liveUserLotteryRecord.setOrderStatus(1);
+                liveUserLotteryRecordMapper.updateLiveUserLotteryRecord(liveUserLotteryRecord);
 
                 // 加入redis，24小时自动取消
                 String redisKey = StoreConstants.REDIS_ORDER_OUTTIME_UNPAY + storeOrder.getId();

fs-user-app/src/main/java/com/fs/app/controller/IntegralController.java

@@ -29,6 +29,8 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 
+import static com.fs.his.utils.PhoneUtil.decryptPhone;
+
 
 @Slf4j
 @Api("积分接口")
@@ -113,6 +115,9 @@ public class IntegralController extends  AppBaseController {
     @GetMapping("/getIntegralOrderById")
     public R getIntegralOrderById(@RequestParam("orderId")Long orderId, HttpServletRequest request){
         FsIntegralOrder order=integralOrderService.selectFsIntegralOrderByOrderId(orderId);
+        if (order.getUserPhone().length() > 11) {
+            order.setUserPhone(decryptPhone(order.getUserPhone()));
+        }
         order.setItemJson(adaptItemJson(order.getItemJson()));
         return R.ok().put("data",order);
     }