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

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamLoginInfoVo.java

@@ -102,10 +102,8 @@ public class AdamLoginInfoVo implements Serializable, Cloneable {
         }
     }
 
-    public AdamLoginInfoVo desensitize() {
-        this.userInfo.setPasswd(null);
-//        this.userInfo.setPayCode(null);
-        this.userInfo.setMobile(SensitizeUtil.custom(userInfo.getMobile(), 3, 4));
+    public AdamLoginInfoVo desensitize(Boolean reviewUserInfo) {
+        this.userInfo.desensitize(reviewUserInfo);
         return this;
     }
 }

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamUserInfoVo.java

@@ -9,8 +9,10 @@ import com.liquidnet.service.adam.dto.AdamUserInfoDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
 
 import java.time.LocalDateTime;
+import java.util.Arrays;
 import java.util.List;
 
 @ApiModel(value = "AdamUserInfoVo", description = "用户详情")
@@ -23,7 +25,7 @@ public class AdamUserInfoVo implements java.io.Serializable, Cloneable {
     private String mobile;
     @ApiModelProperty(position = 12, value = "登录密码[64]，只针对PHP老用户，新用户无此功能")
     private String passwd;
-//    @ApiModelProperty(position = 13, value = "支付密码[30]，暂无此功能")
+    //    @ApiModelProperty(position = 13, value = "支付密码[30]，暂无此功能")
 //    private String payCode;
     @ApiModelProperty(position = 14, value = "昵称[32]")
     private String nickname;
@@ -44,13 +46,13 @@ public class AdamUserInfoVo implements java.io.Serializable, Cloneable {
     @ApiModelProperty(position = 22, value = "标签")
     private List<AdamTagParentVo> tagMe;
     @ApiModelProperty(position = 23, value = "注册时间")
-    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
     private LocalDateTime createAt;
     @ApiModelProperty(position = 24, value = "最近一次更新时间")
-    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
     private LocalDateTime updatedAt;
     @ApiModelProperty(position = 25, value = "注销时间")
-    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
     private LocalDateTime closedAt;
     @ApiModelProperty(position = 26, value = "完善信息进度[0-未完善,1-已完善]")
     private Integer isComplete;
@@ -85,7 +87,8 @@ public class AdamUserInfoVo implements java.io.Serializable, Cloneable {
         this.setAvatar(source.getAvatar());
 
         this.setBackground(source.getBackground());
-        this.setTagMe(JsonUtils.fromJson(source.getTagMe(), new TypeReference<List<AdamTagParentVo>>() {}));
+        this.setTagMe(JsonUtils.fromJson(source.getTagMe(), new TypeReference<List<AdamTagParentVo>>() {
+        }));
         this.setCreateAt(source.getCreateAt());
         this.setUpdatedAt(source.getUpdatedAt());
         this.setClosedAt(source.getClosedAt());
@@ -96,10 +99,42 @@ public class AdamUserInfoVo implements java.io.Serializable, Cloneable {
         return this;
     }
 
-    public AdamUserInfoVo desensitize() {
+    public AdamUserInfoVo desensitize(Boolean reviewUserInfo) {
         this.setPasswd(null);
 //        this.userInfo.setPayCode(null);
         this.setMobile(SensitizeUtil.custom(this.getMobile(), 3, 4));
+
+        if (null != reviewUserInfo && reviewUserInfo) {
+            if (!StringUtils.startsWith(this.nickname, "宇航员")) {
+                this.setNickname(SensitizeUtil.custom(this.nickname, 1, 0) + "（审核中）");
+            }
+            if (StringUtils.isNotEmpty(this.signature)) {
+                this.setSignature(SensitizeUtil.custom(this.signature, 1, 0) + "（审核中）");
+            }
+            if (StringUtils.isNotEmpty(this.avatar)) {
+                List<String> defaultAvatarUrlList = Arrays.asList(
+                        "https://img.zhengzai.tv/user/2021/07/27/a4cc2a4e6dcd44d1812dc60e079086b4.png",
+                        "http://pic.zhengzai.tv/479639664.110103C8012C8595A200678A2C06D93D678A3D.png",
+                        "http://pic.zhengzai.tv/default/avatar.png",
+                        "http://img.zhengzai.tv/ticket/20171020/1508473543738.jpg"
+                );
+                if (!defaultAvatarUrlList.contains(this.avatar)) {
+                    this.setAvatar("https://img.zhengzai.tv/headerreview.png");
+                }
+            }
+            if (StringUtils.isNotEmpty(this.background)) {
+                List<String> defaultBkgroudUrlList = Arrays.asList(
+                        "https://img.zhengzai.tv/files/2021/01/13/5ffeab3584b7d.png",
+                        "http://pic.zhengzai.tv/default/background.png",
+                        "http://img.zhengzai.tv/album/20171027/1509106243302.png",
+                        "https://img.zhengzai.tv/other/2021/07/27/150eeb0e20af4fc88e8a1ec57c46c362.png"
+                );
+                if (!defaultBkgroudUrlList.contains(this.background)) {
+                    this.setBackground("https://img.zhengzai.tv/bkgroundreview.png");
+                }
+            }
+        }
+
         return this;
     }
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/admin/upush/create.html

@@ -101,9 +101,9 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-2 control-label is-required">推送标题：</label>
+            <label class="col-sm-2 control-label">推送标题：</label>
             <div class="col-sm-10">
-                <input class="form-control" type="text" name="pushTitle" id="pushTitle" required>
+                <input class="form-control" type="text" name="pushTitle" id="pushTitle">
             </div>
         </div>
         <div class="form-group">

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/admin/upush/detail.html

@@ -82,7 +82,7 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-2 control-label is-required">推送标题：</label>
+            <label class="col-sm-2 control-label">推送标题：</label>
             <div class="col-sm-10">
                 <input class="form-control" type="text" name="pushTitle" id="pushTitle" disabled th:value="${UpushDetailsListDao.pushTitle}">
             </div>
@@ -90,7 +90,7 @@
         <div class="form-group">
             <label class="col-xs-2 control-label">推送内容：</label>
             <div class="col-xs-10">
-                <textarea name="pushContent" maxlength="500" class="form-control" rows="3" disabled th:text="${UpushDetailsListDao.pushTitle}"></textarea>
+                <textarea name="pushContent" maxlength="500" class="form-control" rows="3" disabled th:text="${UpushDetailsListDao.pushContent}"></textarea>
             </div>
         </div>
         <div class="form-group">

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

@@ -256,7 +256,7 @@ public class AdminUpushServiceImpl extends ServiceImpl<AdminUpushMapper, AdminUp
         try {
             IOSBroadcast broadcast = new IOSBroadcast(iosAppkey, iosAppMasterSecret);
             //alert的值设置为字典
-            broadcast.setAlert(adminUpush.getPushTitle(), adminUpush.getPushTitle(), adminUpush.getPushContent());
+            broadcast.setAlert(adminUpush.getPushTitle(), "", adminUpush.getPushContent());
             broadcast.setBadge(0);
             broadcast.setSound("default");
             if (Arrays.asList(LnsEnum.ENV.dev.name(), LnsEnum.ENV.test.name()).contains(environment.getProperty(CurrentUtil.CK_ENV_ACTIVE))) {

liquidnet-bus-config/liquidnet-config/liquidnet-service-adam-dev.yml

@@ -24,5 +24,7 @@ liquidnet:
   reviewer:
     app-login:
       mobile: 13724286255
+    user-info: true
+
 
 #以下为spring各环境个性配置

liquidnet-bus-config/liquidnet-config/liquidnet-service-adam-test.yml

@@ -24,5 +24,6 @@ liquidnet:
   reviewer:
     app-login:
       mobile: 13724286255
+    user-info: true
 
 #以下为spring各环境个性配置

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

@@ -60,6 +60,9 @@ import java.util.Objects;
 public class AdamLoginController {
     @Autowired
     Environment env;
+    @Value("${liquidnet.reviewer.user-info}")
+    private Boolean reviewUserInfo;
+
     @Autowired
     RedisUtil redisUtil;
     @Autowired
@@ -137,7 +140,7 @@ public class AdamLoginController {
         loginInfoVo.setUserMemberVo(adamRdmService.getUserMemberVoByUid(userInfoVo.getUid()));
 
         log.info(UserPathDto.setData("登录", ServletUtils.getRequest().getParameterMap(), loginInfoVo));
-        return ResponseDto.success(loginInfoVo.desensitize());
+        return ResponseDto.success(loginInfoVo.desensitize(reviewUserInfo));
     }
 
     @ApiOperationSupport(order = 3)
@@ -174,7 +177,7 @@ public class AdamLoginController {
         }
 
         log.info(UserPathDto.setData(toRegister ? "注册" : "登录", ServletUtils.getRequest().getParameterMap(), loginInfoVo));
-        return ResponseDto.success(loginInfoVo.desensitize());
+        return ResponseDto.success(loginInfoVo.desensitize(reviewUserInfo));
     }
 
     @ApiOperationSupport(order = 4)
@@ -201,7 +204,7 @@ public class AdamLoginController {
         }
 
         log.info(UserPathDto.setData(toRegister ? "注册" : "登录", ServletUtils.getRequest().getParameterMap(), loginInfoVo));
-        return ResponseDto.success(loginInfoVo.desensitize());
+        return ResponseDto.success(loginInfoVo.desensitize(reviewUserInfo));
     }
 
     @ApiOperationSupport(order = 5)
@@ -252,7 +255,7 @@ public class AdamLoginController {
         loginInfoVo.setWechatUnionid(wechatUnionid);
 
         log.info(UserPathDto.setData(toRegister ? "注册" : "登录", ServletUtils.getRequest().getParameterMap(), loginInfoVo));
-        return ResponseDto.success(loginInfoVo.desensitize());
+        return ResponseDto.success(loginInfoVo.desensitize(reviewUserInfo));
     }
 
     @ApiOperationSupport(order = 6)
@@ -286,7 +289,7 @@ public class AdamLoginController {
         loginInfoVo.setToken(this.ssoProcess(loginInfoVo.getUserInfo()));
 
         log.info(UserPathDto.setData(toRegister ? "注册" : "登录", ServletUtils.getRequest().getParameterMap(), loginInfoVo));
-        return ResponseDto.success(loginInfoVo.desensitize());
+        return ResponseDto.success(loginInfoVo.desensitize(reviewUserInfo));
     }
 
     @ApiOperationSupport(order = 7)

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

@@ -25,6 +25,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.env.Environment;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
@@ -47,6 +48,9 @@ import java.util.Optional;
 public class AdamUserController {
     @Autowired
     Environment env;
+    @Value("${liquidnet.reviewer.user-info}")
+    private Boolean reviewUserInfo;
+
     @Autowired
     AdamRdmService adamRdmService;
     @Autowired
@@ -136,8 +140,8 @@ public class AdamUserController {
         editVo.setIsComplete(1);
 
         adamUserInfoService.edit(editVo);
-        editVo.setMobile(SensitizeUtil.custom(editVo.getMobile(), 3, 4));
-        return ResponseDto.success(editVo);
+//        editVo.setMobile(SensitizeUtil.custom(editVo.getMobile(), 3, 4));
+        return ResponseDto.success(editVo.desensitize(reviewUserInfo));
     }
 
     @ApiOperationSupport(order = 2)
@@ -306,7 +310,7 @@ public class AdamUserController {
 
         Map<String, Object> map = CollectionUtil.mapStringObject();
         AdamUserInfoVo userInfoVo = adamRdmService.getUserInfoVoByUid(currentUid);
-        map.put("userInfo", userInfoVo.desensitize());
+        map.put("userInfo", userInfoVo.desensitize(reviewUserInfo));
         map.put("realNameInfo", adamRdmService.getRealInfoVoByUid(currentUid));
         map.put("thirdPartInfo", adamRdmService.getThirdPartVoListByUid(currentUid));
         map.put("userMemberVo", adamRdmService.getUserMemberVoByUid(currentUid));

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java

@@ -413,57 +413,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 return "申请金额不得小于0";
             }
 
-            // 临时手续费
-            if (orderTicketVo.getPerformanceId().equals("245383231370444809122956")) {
-                // 手续费比例
-                float chargesNum = 0.0f;
-                // 票种演出开始时间
-                String useStart = orderTicketVo.getUseStart();
-                DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-                LocalDateTime useStartD = LocalDateTime.parse(useStart, df);
-                // 3、15天之前的时间
-                LocalDateTime useStartD15Before = useStartD.minusDays(15);
-                LocalDateTime useStartD3Before = useStartD.minusDays(3);
-                // 当前时间
-                LocalDateTime nowTime = LocalDateTime.now();
-
-                if (useStartD15Before.isAfter(nowTime)) { // 15天以前的时间大于当前时间 距离演出开始日期>15天
-                    chargesNum = 0.1f;
-                    log.info("距离演出开始日期>15天");
-                    log.info("票种演出开始时间 {}", useStartD);
-                    log.info("15天之前的时间 {}", useStartD15Before);
-                    log.info("3天之前的时间 {}", useStartD3Before);
-                    log.info("当前时间 {}", nowTime);
-                    log.info("手续费比例 {}", chargesNum);
-                } else if (useStartD3Before.isAfter(nowTime)) { // 3天以前的时间大于当前时间 距离演出开始日期>3天-15天 含15天
-                    chargesNum = 0.5f;
-                    log.info("距离演出开始日期3-15天");
-                    log.info("票种演出开始时间 {}", useStartD);
-                    log.info("15天之前的时间 {}", useStartD15Before);
-                    log.info("3天之前的时间 {}", useStartD3Before);
-                    log.info("当前时间 {}", nowTime);
-                    log.info("手续费比例 {}", chargesNum);
-                } else { // 三天以内 <=3
-                    log.info("距离演出开始日期<=3");
-                    log.info("票种演出开始时间 {}", useStartD);
-                    log.info("15天之前的时间 {}", useStartD15Before);
-                    log.info("3天之前的时间 {}", useStartD3Before);
-                    log.info("当前时间 {}", nowTime);
-                    log.info("手续费比例 {}", chargesNum);
-                    return "当前日期不支持退票";
-                }
-                BigDecimal multiply = refundSinglePrice.multiply(BigDecimal.valueOf(chargesNum));
-                log.info("multiply {}", multiply);
-                refundSinglePrice = refundSinglePrice.subtract(multiply);
-                log.info("去除手续费申请金额 {}", refundSinglePrice);
-                if (refundSinglePrice.compareTo(BigDecimal.ZERO) <= 0) {
-                    return "申请金额不得小于0";
-//                    return "去除手续费申请金额不得小于0";
-                }
-            } else{
-                log.info("演出id1111 {}", orderTicketVo.getPerformanceId());
-            }
-            // 临时手续费 end
             Map token = CurrentUtil.getTokenClaims();
             String username = StringUtils.defaultString(((String) token.get("nickname")), "");
             String result = refundsStatusService.userOrderTicketRefunding(orderTicketVo, refundSinglePrice.doubleValue(), orderTicketEntitiesId, reason, picList, uid, username, kylinOrderRefundsVoBaseList.size());

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java

@@ -183,7 +183,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
 
     public List<KylinPerformanceVo> roadList(String roadShowId) {
         List<KylinPerformanceVo> performancesList = dataUtils.getRoadList(roadShowId);
-        performancesList = checkAppStatus(performancesList);
+        performancesList = checkAppStatusRoad(performancesList);
         return performancesList;
     }
 
@@ -219,6 +219,7 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
                 partner.setTicketList(ticketListNew);
                 if (ticketListNew.size() == 0) {
                     ticketTimesList.remove(i);
+                    i--;
                 }
             }
         }
@@ -419,6 +420,41 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
         }
         return newList;
     }
+    public List<KylinPerformanceVo> checkAppStatusRoad(List<KylinPerformanceVo> list) {
+        List<KylinPerformanceVo> newList = ObjectUtil.getKylinPerformanceVoArrayList();
+        if (!CollectionUtils.isEmpty(list)) {
+            String nowTimeStr = DateUtil.getNowTime();
+            for (KylinPerformanceVo info : list) {
+                // 当前时间大于停售时间 小于结束时间 是 停售
+                String stopSellTime = info.getStopSellTime();
+                String timeEnd = info.getTimeEnd();
+                Integer isEnd = DateUtil.compareStrDay(nowTimeStr, timeEnd);
+                if (1 == DateUtil.compareStrDay(nowTimeStr, stopSellTime) && -1 == DateUtil.compareStrDay(nowTimeStr, timeEnd)) {
+                    info.setAppStatus(11);
+                }
+
+                // 票状态 6票可购买 8售罄 9未开始 10结束 11停售
+//                if (3 != info.getAppStatus() && 7 != info.getAppStatus() && 1 != isEnd) { // 演出已结束、未上线 不展示
+                if (3 != info.getAppStatus() && 7 != info.getAppStatus()) { // 演出已结束、未上线 不展示
+                    String sellTime = info.getSellTime();
+                    if (1 == DateUtil.compareStrDay(sellTime, nowTimeStr)) {// 未开始
+                        info.setAppStatus(9);
+                        int isMemberStatus = getPerformanceIsMemberStatus(info);
+                        if (1 == isMemberStatus) {
+                            info.setAppStatus(6);
+                        }
+                    } else { // 已开始
+                        info.setAppStatus(6);
+                        if (1 == DateUtil.compareStrDay(nowTimeStr, timeEnd)) { // 演出已结束
+                            info.setAppStatus(10);
+                        }
+                    }
+                    newList.add(info);
+                }
+            }
+        }
+        return newList;
+    }
 
     public KylinPerformanceVo checkAppStatusInfo(KylinPerformanceVo info) {
         if (null != info) {

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetAppletController.java

@@ -91,7 +91,7 @@ public class SweetAppletController {
                                                            @RequestParam(required = false) Integer page,
                                                            @RequestParam(required = false) Integer size,
                                                            @RequestParam String uid) {
-
+        try {
             List<SweetManualArtistListDto> allReturnArtist = ObjectUtil.getSweetManualArtistListDtoList();
             List<SweetManualArtistListDto> returnArtist = ObjectUtil.getSweetManualArtistListDtoList();
 
@@ -174,6 +174,9 @@ public class SweetAppletController {
             data.setData(returnArtist);
             data.setTotal(allReturnArtist.size());
             return ResponseDto.success(data);
+        } catch (Exception e) {
+            return ResponseDto.failure();
+        }
     }
 
     @GetMapping("richText")
@@ -353,7 +356,7 @@ public class SweetAppletController {
         if (mobile == null || mobile.isEmpty()) {
             return ResponseDto.failure();
         }
-        SweetPrizeVo vo = redisDataUtils.changeLuckDrawStatus(mobile,unionId, luckDrawNum);
+        SweetPrizeVo vo = redisDataUtils.changeLuckDrawStatus(mobile, unionId, luckDrawNum);
         return ResponseDto.success(vo);
     }
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetAppletMdskController.java

@@ -91,7 +91,7 @@ public class SweetAppletMdskController {
                                                                @RequestParam(required = false) Integer page,
                                                                @RequestParam(required = false) Integer size,
                                                                @RequestParam String uid) {
-
+        try {
             List<SweetManualArtistListMDSKDto> allReturnArtist = ObjectUtil.getSweetManualArtistListMDSKDtoList();
             List<SweetManualArtistListMDSKDto> returnArtist = ObjectUtil.getSweetManualArtistListMDSKDtoList();
 
@@ -174,6 +174,9 @@ public class SweetAppletMdskController {
             data.setData(returnArtist);
             data.setTotal(allReturnArtist.size());
             return ResponseDto.success(data);
+        } catch (Exception e) {
+            return ResponseDto.failure();
+        }
     }
 
     @GetMapping("richText")

liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/com/liquidnet/service/sweet/mapper/SweetManualArtistsMapper.xml

@@ -40,6 +40,7 @@
         <where>
             sma.status = 1 and manual_id = #{manualId}
         </where>
+        ORDER BY sma.updated_at DESC
     </select>
 
     <select id="getManualDetails" parameterType="java.util.Map" resultMap="getManualListResult">

liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/com/liquidnet/service/sweet/mapper/SweetManualArtistsMdskMapper.xml

@@ -40,6 +40,7 @@
         <where>
             sma.status = 1 and manual_id = #{manualId}
         </where>
+        ORDER BY sma.updated_at DESC
     </select>
 
     <select id="getManualDetails" parameterType="java.util.Map" resultMap="getManualListResult">

liquidnet-bus-support/liquidnet-support-config/src/main/resources/application-dev.yml

@@ -19,7 +19,7 @@ liquidnet:
     password: admin
   config:
     #    location: /Users/color/company_project/java/liquidnet-bus-v1-1/liquidnet-bus-config/liquidnet-config
-#    location: /Users/hujiachen/JavaProject/liquidnet-bus-v1/liquidnet-bus-config/liquidnet-config
+#    location: /Users/hujiachen/IdeaProjects/liquidnet-bus-v1/liquidnet-bus-config/liquidnet-config
     location: /app/support-config
 # end-dev-这里是配置信息基本值