打款功能修改

liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/constant/SmileRedisConst.java

@@ -20,6 +20,7 @@ public class SmileRedisConst {
 
     public static final String SELL_DATA_COMMISSION = PREFIX.concat("sellDataCommission:");  //销售数据 第一步
     public static final String SELL_SHOW_PAYMENT = PREFIX.concat("show:payment:");  //打款信息  SELL_SHOW_PAYMENT+演出id+uid
+    public static final String SELL_SHOW_SAVE = PREFIX.concat("show:save:");  //演出打款vo数据  SELL_SHOW_SAVE+演出id
 
     public static final String SELL_SHOW_PAYMENT_ENDJOB = PREFIX.concat("show:payment:endJob");  //定时任务结算信息  SELL_SHOW_PAYMENT_ENDJOB+演出id+uid
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/utils/SmileRedisUtils.java

 package com.liquidnet.client.admin.zhengzai.smile.utils;
 
+import com.liquidnet.client.admin.zhengzai.smile.dto.ShowVo;
 import com.liquidnet.client.admin.zhengzai.smile.dto.UserData;
 import com.liquidnet.service.goblin.dto.vo.SmileProjectDetailsVo;
 import com.liquidnet.common.cache.redis.util.AbstractRedisUtil;
@@ -317,4 +318,27 @@ public class SmileRedisUtils {
         String rdk = SmileRedisConst.VOLUNTEERS_DETAILS.concat(projectId).concat(":uid:").concat(uid);
         getRedis().set(rdk, teamIds);
     }
+
+    /**
+     * 保存演出列表vo
+     * @param vo
+     */
+    public void setShowVoByPerId(ShowVo vo) {
+        String key = SmileRedisConst.SELL_SHOW_SAVE.concat(vo.getPerformancesId());
+        redisDataSourceUtil.getRedisSweetUtil().set(key,vo);
+    }
+    /**
+     * 获取演出列表vo
+     * @param vo
+     */
+    public ShowVo getShowVoByPerId(String perId) {
+        String key = SmileRedisConst.SELL_SHOW_SAVE.concat(perId);
+        Object o = redisDataSourceUtil.getRedisSweetUtil().get(key);
+        if (o==null){
+            return null;
+        }else {
+            return (ShowVo) o;
+        }
+    }
+
 }

liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/entity/SmilePrice.java

@@ -49,6 +49,11 @@ public class SmilePrice implements Serializable {
      */
     private String record;
 
+    /**
+     * 打款标识0：未打款，1：已打款
+     */
+    private Integer status;
+
     /**
      * 0：未删除，1：已删除
      */
@@ -64,6 +69,14 @@ public class SmilePrice implements Serializable {
      */
     private LocalDateTime updatedDate;
 
+    private static final SmilePrice obj = new SmilePrice();
 
+    public static SmilePrice getNew() {
+        try {
+            return (SmilePrice) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new SmilePrice();
+        }
+    }
 
 }

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

@@ -43,4 +43,6 @@ public interface SmileUserMapper extends BaseMapper<SmileUser> {
     List<SmileUser> getAllUidByPerId(@Param("performancesId") String performancesId);
 
     List<SmileUser> selectUidByPerId(@Param("performancesId") String performancesId);
+
+    List<SmileUser> selectUidByPerIdNotType(@Param("performancesId") String performancesId);
 }

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

@@ -144,7 +144,7 @@
                         WHERE
                             kotr.performance_id = #{performancesId}
                           AND kotr.agent_id != 0
-                          AND COALESCE ( kotr.agent_id, kotr.agent_id_master ) NOT IN ( SELECT sp.uid FROM smile_price AS sp WHERE sp.performanceS_id = #{performancesId} AND sp.record != '')
+                          AND COALESCE ( kotr.agent_id, kotr.agent_id_master ) NOT IN ( SELECT sp.uid FROM smile_price AS sp WHERE sp.performanceS_id = #{performancesId} AND sp.uid IS NOT NULL AND sp.record != '')
                         GROUP BY
                             uid
                     )

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

@@ -169,22 +169,26 @@
     </select>
 
     <select id="selectUidByPerId" resultType="com.liquidnet.service.smile.entity.SmileUser">
-        SELECT su.uid,
-               su.name,
-               su.type,
-               su.city
-        FROM smile_user AS su
-                 INNER JOIN(
-            SELECT COALESCE
-                       (kotr.agent_id, kotr.agent_id_master) uid
-            FROM kylin_order_ticket_relations AS kotr
-            WHERE kotr.performance_id = #{performancesId}
-              AND kotr.agent_id != 0
-              AND COALESCE(kotr.agent_id, kotr.agent_id_master) NOT IN (SELECT sp.uid
-                                                                        FROM smile_price AS sp
-                                                                        WHERE sp.performanceS_id = #{performancesId}
-                                                                          AND sp.record != '')
-            GROUP BY uid) AS uu ON uu.uid = su.uid
+        SELECT
+            su.uid,
+            su.name,
+            su.type,
+            su.city
+        FROM
+            smile_user AS su
+                INNER JOIN ( SELECT kotr.agent_id, kotr.agent_id_master FROM kylin_order_ticket_relations AS kotr WHERE kotr.performance_id = #{performancesId} AND kotr.agent_id != 0 ) kk ON su.uid = kk.agent_id
+                OR su.uid = kk.agent_id_master
         WHERE su.type = 1
     </select>
+
+    <select id="selectUidByPerIdNotType" resultType="com.liquidnet.service.smile.entity.SmileUser">
+        SELECT
+            su.uid
+        FROM
+            smile_user AS su
+                INNER JOIN ( SELECT kotr.agent_id, kotr.agent_id_master FROM kylin_order_ticket_relations AS kotr WHERE kotr.performance_id = #{performancesId} AND kotr.agent_id != 0 ) kk ON su.uid = kk.agent_id
+                OR su.uid = kk.agent_id_master
+    </select>
+
+
 </mapper>