颓废管理调整

gly-base-core/src/main/java/cn/com/taiji/core/repo/request/issue/IssueOrderRefundPageRequest.java

@@ -21,8 +21,8 @@ import java.time.LocalDateTime;
 @Setter
 public class IssueOrderRefundPageRequest extends JpaDateTimePageableDataRequest<IssueOrderRefund> {
 
-    /** 订单号 */
-    private String orderNo;
+    /** 支付订单号 */
+    private String externalOrderNo;
 
     /** 卡号 */
     private String cardId;
@@ -59,12 +59,12 @@ public class IssueOrderRefundPageRequest extends JpaDateTimePageableDataRequest<
     @Override
     public HqlBuilder toSelectHql() {
         HqlBuilder hql = new HqlBuilder("from IssueOrderRefund where 1=1 ");
-        hql.append(" and agencyId=:agencyId",agencyId);
-        hql.append(" and orderNo=:orderNo",orderNo);
-        hql.append(" and cardId=:cardId",cardId);
-        hql.append(" and vehiclePlate=:vehiclePlate",vehiclePlate);
+        hql.append(" and agencyId = :agencyId",agencyId);
+        hql.append(" and externalOrderNo = :externalOrderNo",externalOrderNo);
+        hql.append(" and cardId = :cardId",cardId);
+        hql.append(" and vehiclePlate = :vehiclePlate",vehiclePlate);
         hql.append(" and vehiclePlatecolor = :vehiclePlatecolor",vehiclePlatecolor);
-        hql.append(" and refundBusiness = :businessPort",businessPort);
+        hql.append(" and businessPort = :businessPort",businessPort);
         hql.append(" and status=:status",status);
         hql.append(" and insertTime >= :startTime", startTime);
         hql.append(" and insertTime <= :endTime", endTime);

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/manager/issue/UserEquityLinkManagerImpl.java

@@ -61,13 +61,16 @@ public class UserEquityLinkManagerImpl extends AbstractIawManager implements Use
     @Transactional(rollbackFor = Exception.class)
     public UserEquityLinkReceiveResponseDTO equityReceive(UserEquityLinkReceiveRequestDTO dto) throws ManagerException {
         UserEquityLink equityLink = repo.findById(dto.getId()).orElse(null);
+        if (equityLink == null){
+            throw new ManagerException("未获取到权益！");
+        }
         if (LocalDateTime.now().isAfter(equityLink.getValidEndTime())){
             throw new ManagerException("权益已过期！");
         }
         //获取兑换码
         IssueSingleEquity singleEquity = singleEquityRepo.findBySingleEquityId(equityLink.getEquityId());
         if (singleEquity == null ){
-            throw new ManagerException("单项权益异常！");
+            throw new ManagerException("未获取到单项权益！");
         }
         List<IssueCouponDetail> couponDetailList = couponDetailRepo.listByCouponIdAndStatus(singleEquity.getCouponId(), CouponStatus.WAIT_GET);
         if (CollectionTools.isEmpty(couponDetailList)){