exit

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileAgentController.java

@@ -28,10 +28,10 @@ public class SmileAgentController {
     ISmileAgentService smileAgentService;
 
     @PostMapping("/list")
-    @ApiOperation("获取票提")
+    @ApiOperation("根据PerId获取票提")
     @ResponseBody
-    public AjaxResult organizationList(@RequestBody SmileAgent smileAgent){
-        return AjaxResult.success(smileAgentService.getAgent(smileAgent));
+    public AjaxResult organizationList(@RequestParam(name = "performancesId", required = true)String performancesId){
+        return AjaxResult.success(smileAgentService.getAgent(performancesId));
     }
 
     @PostMapping("/create")

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileSchoolController.java

@@ -3,6 +3,7 @@ package com.liquidnet.client.admin.web.controller.zhengzai.smile;
 
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
+import com.liquidnet.client.admin.common.core.page.TableDataInfo;
 import com.liquidnet.client.admin.zhengzai.smile.dto.SmileSchoolParam;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileSchoolService;
 import com.liquidnet.service.smile.entity.SmileSchool;
@@ -31,9 +32,13 @@ public class SmileSchoolController {
     @PostMapping("/list")
     @ApiOperation("获取学校列表")
     @ResponseBody
-    public AjaxResult schoolList(SmileSchoolParam smileSchoolParam) {
+    public TableDataInfo schoolList(SmileSchoolParam smileSchoolParam) {
         PageInfo<SmileSchool> smileSchools = iSmileSchoolService.schoolList(smileSchoolParam);
-        return AjaxResult.success(smileSchools);
+        TableDataInfo rspData = new TableDataInfo();
+        rspData.setCode(0);
+        rspData.setRows(smileSchools.getList());
+        rspData.setTotal(smileSchools.getTotal());
+        return rspData;
     }
 
     @GetMapping("/getSchoolById")

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileShowController.java

@@ -6,6 +6,7 @@ import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
 import com.liquidnet.client.admin.zhengzai.smile.dto.ShowSort;
 import com.liquidnet.client.admin.zhengzai.smile.dto.ShowVo;
+import com.liquidnet.client.admin.zhengzai.smile.dto.SmilePriceParam;
 import com.liquidnet.client.admin.zhengzai.smile.dto.SmileShowParam;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileShowService;
 import io.swagger.annotations.Api;
@@ -27,7 +28,7 @@ public class SmileShowController {
     @PostMapping("/list")
     @ApiOperation("演出列表")
     @ResponseBody
-    public TableDataInfo schoolList(SmileShowParam smileShowParam) {
+    public TableDataInfo schoolList(@RequestBody SmileShowParam smileShowParam) {
         PageInfo<ShowVo> list = smileShowService.listShow(smileShowParam);
         TableDataInfo rspData = new TableDataInfo();
         rspData.setCode(0);
@@ -50,8 +51,8 @@ public class SmileShowController {
 
     @PostMapping("/price")
     @ApiOperation("打款")
-    public AjaxResult price(String performancesId) {
-        return smileShowService.price(performancesId);
+    public AjaxResult price(@RequestBody SmilePriceParam smilePriceParam) {
+        return smileShowService.price(smilePriceParam);
     }
 
     @PostMapping("/saleData")

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinPerformancesAdminServiceImpl.java

@@ -591,9 +591,9 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
             performanceVoUtils.performanceVoStatus(performancesId);
             //开启/关闭代理存 redis
             if (status.equals(1)) {
-                smileRedisUtils.lSet(SmileRedisConst.SMILE_SHOW.concat(":performancesId"),performancesId);
+                smileRedisUtils.lSet(SmileRedisConst.SMILE_SHOW.concat(":").concat(performancesId),ticketId);
             }else {
-                smileRedisUtils.lRemove(SmileRedisConst.SMILE_SHOW.concat(":performancesId"), 1, performancesId);
+                smileRedisUtils.lRemove(SmileRedisConst.SMILE_SHOW.concat(":").concat(performancesId), 1, ticketId);
             }
             return true;
         } catch (Exception e) {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/SaleDataVo.java

@@ -15,6 +15,11 @@ public class SaleDataVo {
      */
     private String performancesId;
 
+    /**
+     * 演出名称
+     */
+    private String title;
+
     /**
      * 票提设置集合
      */

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/SmilePriceParam.java

+package com.liquidnet.client.admin.zhengzai.smile.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2022-03-22
+ */
+@Data
+public class SmilePriceParam implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    private Long id;
+
+    /**
+     * 演出id
+     */
+    @NotBlank(message = "演出id不能为空")
+    private String performancesId;
+
+    /**
+     * 票id
+     */
+    @NotBlank(message = "票种id不能为空")
+    private String ticketsId;
+
+    /**
+     * 用户id
+     */
+    @NotBlank(message = "用户id不能为空")
+    private String uid;
+
+    /**
+     * 打款金额
+     */
+    @NotBlank(message = "打款金额不能为空")
+    private BigDecimal price;
+
+
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/ISmileAgentService.java

@@ -20,5 +20,5 @@ public interface ISmileAgentService extends IService<SmileAgent> {
 
     boolean create(List<SmileAgent> smileAgents);
 
-    String getAgent(SmileAgent smileAgent);
+    String getAgent(String performancesId);
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/ISmileShowService.java

@@ -6,6 +6,7 @@ import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.zhengzai.smile.dto.ShowSort;
 import com.liquidnet.client.admin.zhengzai.smile.dto.ShowVo;
+import com.liquidnet.client.admin.zhengzai.smile.dto.SmilePriceParam;
 import com.liquidnet.client.admin.zhengzai.smile.dto.SmileShowParam;
 import com.liquidnet.service.smile.entity.SmileSchool;
 
@@ -23,7 +24,7 @@ public interface ISmileShowService extends IService<SmileSchool> {
 
     AjaxResult sort(ShowSort showSort);
 
-    AjaxResult price(String performancesId);
+    AjaxResult price(SmilePriceParam smilePriceParam);
 
     AjaxResult getShowById(String performancesId);
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileAgentServiceImpl.java

@@ -9,6 +9,8 @@ import com.liquidnet.client.admin.zhengzai.smile.service.ISmileAgentService;
 import com.liquidnet.client.admin.zhengzai.smile.utils.SmileRedisUtils;
 import com.liquidnet.service.goblin.constant.SmileRedisConst;
 import com.liquidnet.service.goblin.dto.vo.SmileAgentVo;
+import com.liquidnet.service.kylin.entity.KylinTickets;
+import com.liquidnet.service.kylin.mapper.KylinTicketsMapper;
 import com.liquidnet.service.smile.entity.SmileAgent;
 import com.liquidnet.service.smile.mapper.SmileAgentMapper;
 import lombok.extern.slf4j.Slf4j;
@@ -36,12 +38,15 @@ public class SmileAgentServiceImpl extends ServiceImpl<SmileAgentMapper, SmileAg
     @Autowired
     SmileRedisUtils smileRedisUtils;
 
+    @Autowired
+    KylinTicketsMapper kylinTicketsMapper;
+
     @Override
     public SmileAgent listAgentByShowIdAndTicketId(String performanceId, String ticketId) {
         if (StringUtils.isNotEmpty(performanceId) && StringUtils.isNotEmpty(ticketId)) {
-            LambdaQueryWrapper<SmileAgent> queryWrapper  = Wrappers.lambdaQuery(SmileAgent.class);
-            queryWrapper.eq(SmileAgent::getPerformanceId,performanceId);
-            queryWrapper.eq(SmileAgent::getTicketId,ticketId);
+            LambdaQueryWrapper<SmileAgent> queryWrapper = Wrappers.lambdaQuery(SmileAgent.class);
+            queryWrapper.eq(SmileAgent::getPerformanceId, performanceId);
+            queryWrapper.eq(SmileAgent::getTicketId, ticketId);
             smileAgentMapper.selectOne(queryWrapper);
             return null;
         }
@@ -95,7 +100,20 @@ public class SmileAgentServiceImpl extends ServiceImpl<SmileAgentMapper, SmileAg
     }
 
     @Override
-    public String getAgent(SmileAgent smileAgent) {
+    public String getAgent(String performancesId) {
+        //从redis取出开启代理的票id
+//        smileRedisUtils.lSet(SmileRedisConst.SMILE_SHOW.concat(":performancesId"),ticketId);
+        List<Object> ticketsList = smileRedisUtils.lGet(SmileRedisConst.SMILE_SHOW.concat(":").concat(performancesId), 0, -1);
+        if (StringUtils.isNotEmpty(ticketsList)) {
+            for (Object tickets : ticketsList) {
+                //根据票id查询票名及其
+                LambdaQueryWrapper<KylinTickets> queryWrapper = Wrappers.lambdaQuery(KylinTickets.class);
+                queryWrapper.eq(KylinTickets::getTicketsId,tickets);
+                KylinTickets kylinTickets = kylinTicketsMapper.selectOne(queryWrapper);
+
+            }
+        }
+
         return null;
     }
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileShowServiceImpl.java

@@ -11,6 +11,7 @@ import com.liquidnet.client.admin.zhengzai.smile.dto.*;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileShowService;
 import com.liquidnet.client.admin.zhengzai.smile.utils.SmileRedisUtils;
 import com.liquidnet.service.goblin.constant.SmileRedisConst;
+import com.liquidnet.service.goblin.dto.vo.SellDataVO;
 import com.liquidnet.service.kylin.dao.KylinOrderTicketAndAgentVo;
 import com.liquidnet.service.kylin.dao.TicketAndStatusDao;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
@@ -18,11 +19,15 @@ import com.liquidnet.service.kylin.entity.KylinPerformances;
 import com.liquidnet.service.kylin.mapper.*;
 import com.liquidnet.service.kylin.service.admin.IKylinPerformancesAdminService;
 import com.liquidnet.service.smile.entity.SmileAgent;
+import com.liquidnet.service.smile.entity.SmilePrice;
 import com.liquidnet.service.smile.entity.SmileSchool;
+import com.liquidnet.service.smile.entity.SmileUser;
 import com.liquidnet.service.smile.mapper.SmileAgentMapper;
+import com.liquidnet.service.smile.mapper.SmilePriceMapper;
 import com.liquidnet.service.smile.mapper.SmileSchoolMapper;
 import com.liquidnet.service.smile.mapper.SmileUserMapper;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
@@ -30,6 +35,7 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -78,6 +84,9 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
     @Autowired
     SmileUserMapper smileUserMapper;
 
+    @Autowired
+    SmilePriceMapper smilePriceMapper;
+
     @Override
     public PageInfo<ShowVo> listShow(SmileShowParam smileShowParam) {
         PageInfo<ShowVo> pageInfo;
@@ -139,13 +148,19 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
     }
 
     @Override
-    public AjaxResult price(String performancesId) {
-        if (!smileRedisUtils.hasKey(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId))) {
-            smileRedisUtils.set(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId), 1);
+    public AjaxResult price(SmilePriceParam smilePriceParam) {
+        if (!smileRedisUtils.hasKey(SmileRedisConst.SELL_SHOW_PAYMENT.concat(smilePriceParam.getPerformancesId()))) {
+            if(smileRedisUtils.set(SmileRedisConst.SELL_SHOW_PAYMENT.concat(smilePriceParam.getPerformancesId()), 1)){
+                //TODO:持久化存儲操作
+                SmilePrice smilePrice = new SmilePrice();
+                BeanUtils.copyProperties(smilePriceParam, smilePrice);
+                smilePrice.setCreatedAt(LocalDateTime.now());
+                smilePriceMapper.insert(smilePrice);
+            }
         } else {
-            smileRedisUtils.del(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId));
+            smileRedisUtils.del(SmileRedisConst.SELL_SHOW_PAYMENT.concat(smilePriceParam.getPerformancesId()));
+            smilePriceMapper.deleteById(smilePriceParam.getId());
         }
-        //TODO:持久化存儲操作
 
         return AjaxResult.success();
     }
@@ -173,11 +188,8 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
             //票提集合  根据演出id查询票提id
             List<ShowAgentVo> showAgentVoList = new ArrayList<>();
             List<ShowTicketVo> showTicketVoList = new ArrayList<>();
-            LambdaQueryWrapper<SmileAgent> queryWrapper = Wrappers.lambdaQuery(SmileAgent.class);
-            queryWrapper.eq(SmileAgent::getPerformanceId, performancesId);
-            List<SmileAgent> smileAgents = smileAgentMapper.selectList(queryWrapper);
-            Map<String, SmileAgent> map = new HashMap<>(smileAgents.size());
-            smileAgents.forEach(smileAgent -> map.put(smileAgent.getTicketId(), smileAgent));
+            List<SmileAgent> smileAgents = getSmileAgentsByProId(performancesId);
+            Map<String, SmileAgent> map = getSmileAgentMap(smileAgents);
             List<String> ticketsIdList = smileAgents.stream().map(SmileAgent::getTicketId).collect(Collectors.toList());
 
             //根据票提IDs查询票信息
@@ -236,8 +248,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
 
             return AjaxResult.success(showVoById);
         }
-
-        return null;
+        return AjaxResult.warn("请重试");
     }
 
     @Override
@@ -246,11 +257,8 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
         if (!StringUtils.isEmpty(performancesId)){
             SaleDataVo saleDataVo = new SaleDataVo();
 
-            LambdaQueryWrapper<SmileAgent> queryWrapper = Wrappers.lambdaQuery(SmileAgent.class);
-            queryWrapper.eq(SmileAgent::getPerformanceId, performancesId);
-            List<SmileAgent> smileAgents = smileAgentMapper.selectList(queryWrapper);
-            Map<String, SmileAgent> map = new HashMap<>(smileAgents.size());
-            smileAgents.forEach(smileAgent -> map.put(smileAgent.getTicketId(), smileAgent));
+            List<SmileAgent> smileAgents = getSmileAgentsByProId(performancesId);
+            Map<String, SmileAgent> map = getSmileAgentMap(smileAgents);
             List<String> ticketsIdList = smileAgents.stream().map(SmileAgent::getTicketId).collect(Collectors.toList());
 
             List<ShowAgentVo> showAgentVoList = new ArrayList<>();
@@ -262,16 +270,41 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                 ShowAgentVo showAgentVo = getShowAgentVo(performancesId, ticketAndStatusDao, smileAgent);
                 showAgentVoList.add(showAgentVo);
             }
-
-
-
+            //根据演出id查询出所有代理人的uid
+            List<SmileUser> smileUsers = smileUserMapper.getAllUidByPerId(performancesId);
+            List<UserData> userDataList = new ArrayList<>(smileUsers.size());
+            for (SmileUser smileUser : smileUsers){
+                UserData userData = getUserData(performancesId, smileUser);
+                userDataList.add(userData);
+            }
+            saleDataVo.setUserDataList(userDataList);
             saleDataVo.setShowAgentVoList(showAgentVoList);
+            return AjaxResult.success(saleDataVo);
         }
+        return AjaxResult.warn("请重试");
+    }
 
+    private UserData getUserData(String performancesId, SmileUser smileUser) {
+        UserData userData = new UserData();
+        SellDataVO sellDataVO = (SellDataVO) smileRedisUtils.get(SmileRedisConst.SELL_DATA.concat(smileUser.getUid()).concat(performancesId));
+        BeanUtils.copyProperties(sellDataVO, userData);
+        userData.setUid(smileUser.getUid());
+        userData.setUsername(smileUser.getName());
+        userData.setCityName(smileUser.getCity());
+        userData.setType(smileUser.getType());
+        return userData;
+    }
 
+    private Map<String, SmileAgent> getSmileAgentMap(List<SmileAgent> smileAgents) {
+        Map<String, SmileAgent> map = new HashMap<>(smileAgents.size());
+        smileAgents.forEach(smileAgent -> map.put(smileAgent.getTicketId(), smileAgent));
+        return map;
+    }
 
-
-        return null;
+    private List<SmileAgent> getSmileAgentsByProId(String performancesId) {
+        LambdaQueryWrapper<SmileAgent> queryWrapper = Wrappers.lambdaQuery(SmileAgent.class);
+        queryWrapper.eq(SmileAgent::getPerformanceId, performancesId);
+        return smileAgentMapper.selectList(queryWrapper);
     }
 
     private ShowAgentVo getShowAgentVo(String performancesId, TicketAndStatusDao ticketAndStatusDao, SmileAgent smileAgent) {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileUserServiceImpl.java

@@ -62,13 +62,13 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
 
     @Override
     public SmileUser getUserById(String uid) {
-        log.info("查询用户uid:{}", uid);
+        log.debug("查询用户uid:{}", uid);
         //查询未删除,id=uid
         LambdaQueryWrapper<SmileUser> queryWrapper = Wrappers.lambdaQuery(SmileUser.class);
         queryWrapper.eq(SmileUser::getDelTag, 0);
         queryWrapper.eq(SmileUser::getUid, uid);
         SmileUser smileUser = smileUserMapper.selectOne(queryWrapper);
-        log.info("smileUser:{}", smileUser);
+        log.debug("smileUser:{}", smileUser);
         return smileUser;
     }
 

liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/mapper/SmileUserMapper.java

@@ -39,4 +39,6 @@ public interface SmileUserMapper extends BaseMapper<SmileUser> {
     void updateUserCheckByUid(@Param("uid") String uid,@Param("type") Integer type,@Param("reason") String reason);
     int getCount();
     List<SmileUser> pageUser(@Param("offest") int offest,@Param("size") int size);
+
+    List<SmileUser> getAllUidByPerId(String performancesId);
 }

liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileUserMapper.xml

@@ -127,4 +127,8 @@
         update smile_user set  `type` = #{type},error_reason = #{reason}
         where uid = #{uid}
     </update>
+
+    <select id="getAllUidByPerId"  parameterType="java.util.Map" resultType="com.liquidnet.service.smile.entity.SmileUser">
+
+    </select>
 </mapper>