Merge remote-tracking branch 'origin/master' into dev_221101ZGB01

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/goblin/GoblinSelfCategoryAdminController.java

@@ -47,8 +47,12 @@ public class GoblinSelfCategoryAdminController extends BaseController {
     @RequestMapping("list")
     @ResponseBody
     public TableDataInfo list() {
-        PageHelper.startPage(0, 1000, "mid");
-        return getDataTable(goblinSelfGoodsCategoryService.listForMultiGrade());
+//        PageHelper.startPage(0, 1000, "mid");
+//        return getDataTable(goblinSelfGoodsCategoryService.listForMultiGrade());
+        TableDataInfo rspData = new TableDataInfo();
+        rspData.setCode(0);
+        rspData.setRows(goblinSelfGoodsCategoryService.listForMultiGrade());
+        return rspData;
     }
 
     @ApiOperation(value = "筛选")
@@ -130,9 +134,9 @@ public class GoblinSelfCategoryAdminController extends BaseController {
                 if (catePidObj.getName().equals(name.trim())) {
                     return AjaxResult.warn("分类名称与父级分类重复，请核实");
                 }
-                if (goblinSelfGoodsCategoryService.countForMatchName(catePid, name.trim()) > 0) {
-                    return AjaxResult.warn("分类名称重复，请核实");
-                }
+//                if (goblinSelfGoodsCategoryService.countForMatchName(catePid, name.trim()) > 0) {
+//                    return AjaxResult.warn("分类名称重复，请核实");
+//                }
                 break;
             case "3":
                 queryWrapper.eq(GoblinSelfGoodsCategory::getCateId, catePid).eq(GoblinSelfGoodsCategory::getGrade, "2");
@@ -140,12 +144,12 @@ public class GoblinSelfCategoryAdminController extends BaseController {
                 if (null == catePidObj) {
                     return AjaxResult.warn("父级分类无效");
                 }
-                if (catePidObj.getName().equals(name.trim())) {
-                    return AjaxResult.warn("分类名称与父级分类重复，请核实");
-                }
-                if (goblinSelfGoodsCategoryService.countForMatchName(catePidObj.getCatePid(), name.trim()) > 0) {
-                    return AjaxResult.warn("分类名称重复，请核实");
-                }
+//                if (catePidObj.getName().equals(name.trim())) {
+//                    return AjaxResult.warn("分类名称与父级分类重复，请核实");
+//                }
+//                if (goblinSelfGoodsCategoryService.countForMatchName(catePidObj.getCatePid(), name.trim()) > 0) {
+//                    return AjaxResult.warn("分类名称重复，请核实");
+//                }
                 break;
             default:
                 return AjaxResult.warn("分类层级无效");

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/goblin/category/category.html

@@ -208,6 +208,7 @@
             removeUrl: prefix + "/rmv/{id}",
             sortName: "mid",
             modalName: "商品分类",
+            pagination: false,
             // onCheck: onCheck,
             columns: [{
                 radio: true

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

@@ -21,6 +21,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Component
 @Slf4j
@@ -34,7 +35,7 @@ public class SmileRedisUtils {
         return redisDataSourceUtil.getRedisKylinUtil();
     }
 
-    public Object get(String key){
+    public Object get(String key) {
         return redisDataSourceUtil.getRedisKylinUtil().get(key);
     }
 
@@ -91,7 +92,7 @@ public class SmileRedisUtils {
      * 获取全部学校
      */
     public List<SmileSchoolVo> getSchoolAll() {
-       return (List<SmileSchoolVo>)getRedis().get(SmileRedisConst.SMILE_SCHOOL);
+        return (List<SmileSchoolVo>) getRedis().get(SmileRedisConst.SMILE_SCHOOL);
     }
 
     /**
@@ -111,6 +112,7 @@ public class SmileRedisUtils {
 
     /**
      * 保存用户最新计算数据
+     *
      * @param userData
      */
     public void setUserDataByUid(UserData userData, String perId) {
@@ -121,13 +123,13 @@ public class SmileRedisUtils {
     /**
      * 获取用户最新计算数据
      */
-    public UserData getUserDataByUid(String perId,String uid) {
+    public UserData getUserDataByUid(String perId, String uid) {
         String key = SmileRedisConst.SELL_USER_DATA.concat(perId).concat(":").concat(uid);
         Object obj = getRedis().get(key);
-        if (obj==null){
+        if (obj == null) {
             return null;
-        }else {
-            return (UserData)obj;
+        } else {
+            return (UserData) obj;
         }
     }
 
@@ -135,13 +137,14 @@ public class SmileRedisUtils {
      * 保存演出ids
      */
     public void setShowIds(List<String> perId) {
+        perId = perId.stream().distinct().collect(Collectors.toList());
         getRedis().set(SmileRedisConst.SMILE_SHOW, perId);
     }
 
     /**
      * 获取演出ids
      */
-    public List<String> getShowIds(){
+    public List<String> getShowIds() {
         String rdk = SmileRedisConst.SMILE_SHOW;
         Object obj = getRedis().get(rdk);
         if (obj == null) {
@@ -151,7 +154,7 @@ public class SmileRedisUtils {
         }
     }
 
-    public void delShow(){
+    public void delShow() {
         String rdk = SmileRedisConst.SMILE_SHOW;
         Object obj = getRedis().get(rdk);
         if (obj != null) {
@@ -257,9 +260,9 @@ public class SmileRedisUtils {
     public SmileProjectDetailsVo getProject(String projectId) {
         String rdk = SmileRedisConst.PROJECT_DETAILS.concat(projectId);
         Object obj = getRedis().get(rdk);
-        if(obj==null){
+        if (obj == null) {
             return null;
-        }else{
+        } else {
             return (SmileProjectDetailsVo) obj;
         }
     }
@@ -320,21 +323,23 @@ public class SmileRedisUtils {
 
     /**
      * 保存演出列表vo
+     *
      * @param vo
      */
     public void setShowVoByPerId(ShowVo vo) {
         String key = SmileRedisConst.SELL_SHOW_SAVE.concat(vo.getPerformancesId());
-        getRedis().set(key,vo);
+        getRedis().set(key, vo);
     }
+
     /**
      * 获取演出列表vo
      */
     public ShowVo getShowVoByPerId(String perId) {
         String key = SmileRedisConst.SELL_SHOW_SAVE.concat(perId);
         Object o = getRedis().get(key);
-        if (o==null){
+        if (o == null) {
             return null;
-        }else {
+        } else {
             return (ShowVo) o;
         }
     }

liquidnet-bus-common/liquidnet-common-web/src/main/java/com/liquidnet/common/web/filter/GlobalAuthorityInterceptor.java

@@ -85,9 +85,9 @@ public class GlobalAuthorityInterceptor extends HandlerInterceptorAdapter {
                 request.setAttribute(CurrentUtil.uTag, JsonUtils.toJson(claims));
 
             } catch (ExpiredJwtException expiredJwtEx) {
-                log.error("Ex.ExpiredJwtException:{},responseCode:{}", expiredJwtEx.getMessage(), responseCode = TOKEN_INVALID);
+                log.warn("Ex.ExpiredJwtException:{},responseCode:{}", expiredJwtEx.getMessage(), responseCode = TOKEN_INVALID);
             } catch (Exception ex) {
-                log.error("Ex.Exception:{},responseCode:{}", ex.getMessage(), responseCode = TOKEN_ILLEGAL);
+                log.warn("Ex.Exception:{},responseCode:{}", ex.getMessage(), responseCode = TOKEN_ILLEGAL);
             }
         } else {
             responseCode = TOKEN_ILLEGAL;
@@ -276,7 +276,7 @@ public class GlobalAuthorityInterceptor extends HandlerInterceptorAdapter {
 //            log.info("#ATH.ENCRYPT耗时:{}ms", System.currentTimeMillis() - s);
 //            s = System.currentTimeMillis();
             ResponseDto<String> check = feignAuthorityClient.check(encrypt);
-            log.info("#ATH.VALID耗时:{}ms", System.currentTimeMillis() - s);
+            log.debug("#ATH.VALID耗时:{}ms", System.currentTimeMillis() - s);
             if (check.isSuccess()) {
                 String valEncrypt = check.getData();
 
@@ -287,7 +287,7 @@ public class GlobalAuthorityInterceptor extends HandlerInterceptorAdapter {
                 }
             }
         } catch (Exception e) {
-            log.error("GLOBAL:Authority Check Exception", e);
+            log.warn("Ex.Authority Check Exception[ssokey={}]", ssokey, e);
         }
         return val;
     }

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/mapper/GoblinSelfGoodsCategoryMapper.java

@@ -40,7 +40,7 @@ public interface GoblinSelfGoodsCategoryMapper extends BaseMapper<GoblinSelfGood
             "WHERE gsgc.del_flg='0'")
     int statsForForMultiGrade();
 
-    // SELECT cf.cate_id AS fcateId, cf.name AS fname, cf.icon AS ficon, cf.ne_isbn AS fneIsbn, cf.counts AS fcounts , cs.cate_id AS scateId, cs.name AS sname, cs.icon AS sicon, cs.ne_isbn AS sneIsbn, cs.counts AS scounts , ct.cate_id AS tcateId, ct.name AS tname, ct.icon AS ticon, ct.ne_isbn AS tneIsbn, ct.counts AS tcounts FROM goblin_self_goods_category cf LEFT JOIN ( SELECT cate_id, name, icon, grade, ne_isbn , counts, cate_pid FROM goblin_self_goods_category WHERE grade = '2' AND del_flg = '0' ) cs ON cs.cate_pid = cf.cate_id LEFT JOIN ( SELECT cate_id, name, icon, grade, ne_isbn , counts, cate_pid FROM goblin_self_goods_category WHERE grade = '3' AND del_flg = '0' ) ct ON ct.cate_pid = cs.cate_id WHERE cf.grade = '1' AND del_flg = '0'
+    // SELECT cf.cate_id AS fcateId, cf.name AS fname, cf.icon AS ficon, cf.ne_isbn AS fneIsbn, cf.counts AS fcounts , cs.cate_id AS scateId, cs.name AS sname, cs.icon AS sicon, cs.ne_isbn AS sneIsbn, cs.counts AS scounts , ct.cate_id AS tcateId, ct.name AS tname, ct.icon AS ticon, ct.ne_isbn AS tneIsbn, ct.counts AS tcounts FROM goblin_self_goods_category cf LEFT JOIN ( SELECT mid, cate_id, name, icon, grade , ne_isbn, counts, cate_pid FROM goblin_self_goods_category WHERE grade = '2' AND del_flg = '0' ) cs ON cs.cate_pid = cf.cate_id LEFT JOIN ( SELECT mid, cate_id, name, icon, grade , ne_isbn, counts, cate_pid FROM goblin_self_goods_category WHERE grade = '3' AND del_flg = '0' ) ct ON ct.cate_pid = cs.cate_id WHERE cf.grade = '1' AND del_flg = '0' ORDER BY cf.mid, cs.mid, ct.mid;
     @Select({"select cf.cate_id fcateId," +
             "       cf.name    fname," +
             "       cf.icon    ficon," +
@@ -58,12 +58,12 @@ public interface GoblinSelfGoodsCategoryMapper extends BaseMapper<GoblinSelfGood
             "       ct.counts  tcounts " +
             "from goblin_self_goods_category cf " +
             "         left join (" +
-            "    select cate_id, name, icon, grade, ne_isbn, counts, cate_pid from goblin_self_goods_category where grade = '2' and del_flg = '0' " +
+            "    select mid, cate_id, name, icon, grade, ne_isbn, counts, cate_pid from goblin_self_goods_category where grade = '2' and del_flg = '0' " +
             ") cs on cs.cate_pid = cf.cate_id " +
             "         left join (" +
-            "    select cate_id, name, icon, grade, ne_isbn, counts, cate_pid from goblin_self_goods_category where grade = '3' and del_flg = '0' " +
+            "    select mid, cate_id, name, icon, grade, ne_isbn, counts, cate_pid from goblin_self_goods_category where grade = '3' and del_flg = '0' " +
             ") ct on ct.cate_pid = cs.cate_id " +
-            "where cf.grade = '1' and del_flg = '0'"})
+            "where cf.grade = '1' and del_flg = '0' ORDER BY cf.mid,cs.mid,ct.mid"})
     List<GoblinSelfGoodsCategoryDto> listForMultiGrade();
 
     List<String> listForMultiGradeCateId(@Param("cateIdArr") String[] cateIdArr);

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketRelationsMapper.xml

@@ -18,6 +18,7 @@
                           INNER JOIN smile_user AS su ON su.uid = kotr.agent_id
                  WHERE kots.status IN (1,6,3)
                    AND kotr.agent_id != 0
+                   AND (kotr.agent_distributions_master !=0 or kotr.agent_distributions!=0)
                    AND kotr.performance_id = #{performancesId}
                  group by kotr.agent_id) kk;
     </select>

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml

@@ -84,14 +84,14 @@
         LEFT JOIN kylin_order_ticket_status as s on o.order_tickets_id=s.order_id
         LEFT JOIN kylin_order_ticket_relations 	as r ON o.order_tickets_id=r.order_id
         LEFT JOIN kylin_performances as kp ON  r.performance_id= kp.performances_id
-        where r.agent_id=#{agentId} and s.pay_status='1'  GROUP BY r.performance_id
+        where r.agent_id=#{agentId} and s.pay_status='1' AND (r.agent_distributions_master !=0 or r.agent_distributions!=0)  GROUP BY r.performance_id
         UNION ALL
         select o.performance_title as 'title',r.performance_id as 'performanceId' ,SUM(r.agent_distributions_master * (o.price_actual-o.price_refund)) as 'commiss',kp.time_end as 'timeEnd'
         from (select * from kylin_order_tickets where created_at>DATE_SUB(CURDATE(), INTERVAL 6 MONTH)) as o
         LEFT JOIN kylin_order_ticket_status as s on o.order_tickets_id=s.order_id
         LEFT JOIN kylin_order_ticket_relations 	as r ON o.order_tickets_id=r.order_id
         LEFT JOIN kylin_performances as kp ON  r.performance_id= kp.performances_id
-        where r.agent_id_master=#{agentId} and s.pay_status='1'  GROUP BY r.performance_id
+        where r.agent_id_master=#{agentId} and s.pay_status='1' AND (r.agent_distributions_master !=0 or r.agent_distributions!=0)  GROUP BY r.performance_id
         ) as c GROUP BY  c.performanceId
     </select>
 
@@ -124,7 +124,7 @@
         from  (select * from kylin_order_tickets where created_at>DATE_SUB(CURDATE(), INTERVAL 6 MONTH)) as o
         LEFT JOIN kylin_order_ticket_status as s on  o.order_tickets_id=s.order_id
         LEFT JOIN kylin_order_ticket_relations as r ON o.order_tickets_id=r.order_id
-        where  r.agent_id=#{agentId}    and s.pay_status='1'
+        where  r.agent_id=#{agentId}    and s.pay_status='1' AND (r.agent_distributions_master !=0 or r.agent_distributions!=0)
     </select>
     <select id="getUserSellOneDate" parameterType="String" resultType="java.util.Map">
       select t.title as 'title',ticket_id as 'ticketId',(SUM(number)-SUM(refund_number)) as 'number',(SUM(o.price_actual)-SUM(o.price_refund)) as 'price',SUM(r.agent_distributions * (o.price_actual-o.price_refund)) as 'commiss',r.agent_distributions as 'paioTi'
@@ -132,7 +132,7 @@
 	LEFT JOIN kylin_order_ticket_status as s on  o.order_tickets_id=s.order_id
 	LEFT JOIN kylin_order_ticket_relations as r ON o.order_tickets_id=r.order_id
 	LEFT JOIN kylin_tickets  as t  ON  r.ticket_id=t.tickets_id
-	where  r.agent_id=#{agentId} and r.performance_id=#{performanceId}   and s.pay_status='1' GROUP BY r.ticket_id
+	where  r.agent_id=#{agentId} and r.performance_id=#{performanceId}  AND (r.agent_distributions_master !=0 or r.agent_distributions!=0) and s.pay_status='1' GROUP BY r.ticket_id
 
     </select>
     <select id="getUserSellAllDate" parameterType="String" resultType="java.util.Map">
@@ -142,7 +142,7 @@
 	LEFT JOIN kylin_order_ticket_status as s on  o.order_tickets_id=s.order_id
 	LEFT JOIN kylin_order_ticket_relations as r ON o.order_tickets_id=r.order_id
 	LEFT JOIN kylin_tickets  as t  ON  r.ticket_id=t.tickets_id
-	where  r.agent_id=#{agentId} and r.performance_id=#{performanceId}   and s.pay_status='1' GROUP BY r.ticket_id
+	where  r.agent_id=#{agentId} and r.performance_id=#{performanceId} AND (r.agent_distributions_master !=0 or r.agent_distributions!=0)   and s.pay_status='1' GROUP BY r.ticket_id
     ) as c
 
     </select>
@@ -150,7 +150,7 @@
     select o.user_mobile as 'mobile',o.order_code as 'orderId',(o.number-refund_number) as 'number',o.created_at as 'createTime' from kylin_order_tickets as o
 		LEFT JOIN kylin_order_ticket_status as s ON o.order_tickets_id=s.order_id
 		LEFT JOIN kylin_order_ticket_relations as r on o.order_tickets_id=r.order_id
-    where  r.agent_id=#{agentId} and s.pay_status='1' and r.ticket_id=#{ticketId} and (o.number-refund_number)>0
+    where  r.agent_id=#{agentId} and s.pay_status='1' AND (r.agent_distributions_master !=0 or r.agent_distributions!=0) and r.ticket_id=#{ticketId} and (o.number-refund_number)>0
     </select>
 
     <select id="getCanRefundOrderList" parameterType="java.lang.String"
@@ -562,6 +562,7 @@
                 LEFT JOIN kylin_tickets AS kt ON kt.tickets_id = kk.ticket_id
         WHERE
             kk.agent_id != 0
+             AND (kk.agent_distributions_master !=0 or kk.agent_distributions!=0)
 	AND kk.performance_id = #{performancesId}
 	AND kk.ticket_id = #{ticketsId}
     </select>

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinPerformancesMapper.xml

@@ -758,6 +758,7 @@ GROUP BY user_mobile,tickets_id;
                     ) AS kk ON kot.order_tickets_id = kk.order_id
                 WHERE
                     kk.agent_id != 0
+                    AND (kk.agent_distributions_master !=0 or kk.agent_distributions!=0)
                 GROUP BY
                     kk.performance_id
             ) AS map ON map.performance_id = kp.performances_id

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

@@ -116,10 +116,12 @@
                                  INNER JOIN smile_user AS su ON su.uid = kotr.agent_id
                         WHERE kots.status IN (1,6,3)
                           AND kotr.agent_id != 0
+                          AND (kotr.agent_distributions_master !=0 or kotr.agent_distributions!=0)
                           AND kotr.performance_id = #{performancesId}
                         group by kotr.agent_id
                     )
                   AND kotr.performance_id = #{performancesId}
+                  AND (kotr.agent_distributions_master !=0 or kotr.agent_distributions!=0)
                   AND kots.`status` IN ( 1, 6 ,3)
             ) AS sukotr ON sukotr.order_id = kot.order_tickets_id
         GROUP BY