Merge remote-tracking branch 'origin/master'

gly-base-core/src/main/java/cn/com/taiji/core/entity/issue/IssueOrderRefund.java

@@ -54,7 +54,6 @@ public class IssueOrderRefund extends AbstractStringPropertyUUIDEntity {
     @NotNull
     @Column(name = "AMOUNT")
     private Long amount;//金额
-    @NotBlank
     @Size(max = 1024)
     @Column(name = "REFUND_REASON")
     private String refundReason;//退费原因

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

@@ -28,6 +28,7 @@ import cn.com.taiji.core.repo.jpa.user.StaffRepo;
 import cn.com.taiji.iaw.dto.CommRequestDTO;
 import cn.com.taiji.iaw.dto.issue.order.*;
 import cn.com.taiji.iaw.manager.AbstractIawManager;
+import cn.com.taiji.iaw.model.MyFinals;
 import cn.com.taiji.iaw.repo.jpa.request.issue.IssueOrderaPageRequest;
 import cn.com.taiji.iaw.repo.jpa.request.issue.IssueOrdermPageRequest;
 import cn.hutool.core.util.ObjectUtil;
@@ -121,7 +122,9 @@ public class IssueOrderManageImpl extends AbstractIawManager implements IssueOrd
         IssueOrderaPageRequest request = copyProperties(reqDto, new IssueOrderaPageRequest());
         Staff staff = staffRepo.findByStaffId(reqDto.getStaffId());
         request.setStaffOpenId(staff.getOpenId());
-        request.setAgentId(staff.getAgencyId());
+        if (!MyFinals.QTZL_AGENCY_ID.equals(staff.getAgencyId())) {
+            request.setAgentId(staff.getAgencyId());
+        }
         request.setIssueOrderStep(reqDto.getOrderStep());
         return issueOrderinfoRepo.page(request);
     }
@@ -289,7 +292,12 @@ public class IssueOrderManageImpl extends AbstractIawManager implements IssueOrd
         OrderPayApplyResponse response = jsonPostRepeat(request);
         String openId = "-1";
         if (hasText(reqDto.getAccessToken())){
-            openId = findOpenIdByToken(reqDto.getAccessToken());
+            try {
+                openId = findOpenIdByToken(reqDto.getAccessToken());
+            }catch (Exception e){
+                openId = "-1";
+            }
+
         }
         sysPersistOperateLog(OperateType.OPERATE_PAYAPPLY, orderinfo.getId(), reqDto.getOrderSource(), openId, "支付申请");
         return copyProperties(response, new PayApplyResDTO());