~收货地址详情去除脱敏逻辑;

~admin:商品分类+关联商品统计;

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

@@ -129,6 +129,7 @@
 <th:block th:include="include :: bootstrap-fileinput-js" />
 <script th:inline="javascript">
     var rmvFlg = [[${@permission.hasPermi('goblin:category:rmv')}]];
+    var platformUrl = [[${platformUrl}]];
     var prefix = ctx + "goblin/category";
     let rowId = '';
     let modalDom = `<div class="selectClassify">
@@ -176,7 +177,8 @@
     $(function () {
         $("#fileinput").fileinput({
             'theme': 'explorer-fas',
-            'uploadUrl': 'https://devplatform.zhengzai.tv/platform/basicServices/alOss/upload',
+            // 'uploadUrl': 'https://devplatform.zhengzai.tv/platform/basicServices/alOss/upload',
+            'uploadUrl': platformUrl + '/platform/basicServices/alOss/upload',
             "uploadExtraData": {
                 "pathName" : "banner",
                 "buckType" : 1
@@ -230,7 +232,8 @@
         $('#addClassify').append(modalDom)
         $("#fileinput").fileinput({
             'theme': 'explorer-fas',
-            'uploadUrl': 'https://devplatform.zhengzai.tv/platform/basicServices/alOss/upload',
+            // 'uploadUrl': 'https://devplatform.zhengzai.tv/platform/basicServices/alOss/upload',
+            'uploadUrl': platformUrl + '/platform/basicServices/alOss/upload',
             "uploadExtraData": {
                 "pathName" : "banner",
                 "buckType" : 1

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/impl/GoblinSelfGoodsCategoryServiceImpl.java

@@ -46,6 +46,7 @@ public class GoblinSelfGoodsCategoryServiceImpl extends ServiceImpl<GoblinSelfGo
 
     @Override
     public List<GoblinSelfGoodsCategoryDto> listForForMultiGrade() {
+        goblinSelfGoodsCategoryMapper.statsForForMultiGrade();
         return goblinSelfGoodsCategoryMapper.listForForMultiGrade();
     }
 

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

@@ -5,6 +5,7 @@ import com.liquidnet.service.goblin.entity.GoblinSelfGoodsCategory;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 
@@ -17,6 +18,28 @@ import java.util.List;
  * @since 2021-12-27
  */
 public interface GoblinSelfGoodsCategoryMapper extends BaseMapper<GoblinSelfGoodsCategory> {
+    //UPDATE goblin_self_goods_category gsgc
+    //INNER JOIN (
+    //        SELECT cate_fid cate_id,count(1) ct FROM goblin_goods WHERE cate_fid IS NOT NULL AND del_flg='0' group by cate_fid
+    //        UNION ALL
+    //        SELECT cate_sid cate_id,count(1) ct FROM goblin_goods WHERE cate_sid IS NOT NULL AND del_flg='0' group by cate_sid
+    //        UNION ALL
+    //        SELECT cate_tid cate_id,count(1) ct FROM goblin_goods WHERE cate_tid IS NOT NULL AND del_flg='0' group by cate_tid
+    //        ) t ON t.cate_id=gsgc.cate_id
+    //SET gsgc.counts=t.ct
+    //WHERE gsgc.del_flg='0'
+    @Update("UPDATE goblin_self_goods_category gsgc\n" +
+            "INNER JOIN (\n" +
+            "        SELECT cate_fid cate_id,count(1) ct FROM goblin_goods WHERE cate_fid IS NOT NULL AND del_flg='0' group by cate_fid\n" +
+            "        UNION ALL\n" +
+            "        SELECT cate_sid cate_id,count(1) ct FROM goblin_goods WHERE cate_sid IS NOT NULL AND del_flg='0' group by cate_sid\n" +
+            "        UNION ALL\n" +
+            "        SELECT cate_tid cate_id,count(1) ct FROM goblin_goods WHERE cate_tid IS NOT NULL AND del_flg='0' group by cate_tid\n" +
+            "        ) t ON t.cate_id=gsgc.cate_id\n" +
+            "SET gsgc.counts=t.ct\n" +
+            "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({"select cf.cate_id fcateId,\n" +
             "       cf.name    fname,\n" +

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamAddressesController.java

@@ -113,7 +113,7 @@ public class AdamAddressesController {
     public ResponseDto<AdamAddressesVo> query(@NotBlank(message = "收货地址ID不能为空") @PathVariable(name = "id") String addrId) {
         AdamAddressesVo vo = adamRdmService.getAddressesVoByUidAddressesId(CurrentUtil.getCurrentUid(), addrId);
         if (null != vo) {
-            vo.setPhone(SensitizeUtil.custom(vo.getPhone(), 3, 4));
+//            vo.setPhone(SensitizeUtil.custom(vo.getPhone(), 3, 4));
 
             return ResponseDto.success(vo);
         }
@@ -125,9 +125,9 @@ public class AdamAddressesController {
     @PostMapping("query/def")
     public ResponseDto<AdamAddressesVo> queryDef() {
         AdamAddressesVo vo = adamAddressesService.queryDefault(null, CurrentUtil.getCurrentUid(), true);
-        if (null != vo) {
-            vo.setPhone(SensitizeUtil.custom(vo.getPhone(), 3, 4));
-        }
+//        if (null != vo) {
+//            vo.setPhone(SensitizeUtil.custom(vo.getPhone(), 3, 4));
+//        }
         return ResponseDto.success(vo);
     }
 

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamRscController.java

@@ -69,9 +69,9 @@ public class AdamRscController {
     @ApiOperationSupport(order = 20)
     @ApiOperation(value = "@API:入场人列表", notes = "查取用户指定入场人列表")
     @GetMapping("inquire/enters")
-    public ResponseDto<List<AdamEntersVo>> querysEnters(@NotNull(message = "入场人ID不能为空") @RequestParam List<String> entersIds,
+    public ResponseDto<List<AdamEntersVo>> querysEnters(@NotBlank(message = "入场人ID不能为空") @RequestParam String entersIds,
                                                           @NotBlank(message = "用户ID不能为空") @RequestParam String uid) {
-        List<AdamEntersVo> vos = entersIds.isEmpty() ? null : adamRdmService.getEntersVoByUidEntersIds(uid, entersIds);
+        List<AdamEntersVo> vos = entersIds.isEmpty() ? null : adamRdmService.getEntersVoByUidEntersIds(uid, Arrays.asList(entersIds.split(",")));
         return CollectionUtils.isEmpty(vos) ? ResponseDto.failure(ErrorMapping.get("10105")) : ResponseDto.success(vos);
     }