调整

zhywpt-app-iaw/src/main/java/cn/com/taiji/iaw/api/issue/H5OrderController.java

@@ -2,6 +2,7 @@ package cn.com.taiji.iaw.api.issue;
 
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.web.ApiResponse;
+import cn.com.taiji.iaw.api.MyValidController;
 import cn.com.taiji.iaw.dto.issue.h5.*;
 import cn.com.taiji.iaw.dto.issue.order.UploadUserReqDTO;
 import cn.com.taiji.iaw.dto.issue.order.UploadVehicleReqDTO;
@@ -26,7 +27,7 @@ import javax.validation.Valid;
 @Api(tags = {"H5-H5相关接口:WEB"})
 @RestController
 @RequestMapping("/h5/order/web")
-public class H5OrderController {
+public class H5OrderController extends MyValidController {
 
     @Autowired
     private H5OrderManage h5OrderManage;

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

@@ -163,7 +163,7 @@ public abstract class AbstractIawManager extends AbstractCommManager {
     }
 
     protected String getAccountName(String openId) {
-        return getAccountInfo(openId).getUserName();
+        return getAccountInfo(openId) == null ? null : getAccountInfo(openId).getUserName();
     }
 
     protected AccountInfo getAccountInfo(String openId) {

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

@@ -92,7 +92,7 @@ public class IssueOrderManageImpl extends AbstractIawManager implements IssueOrd
         //操作日志
         //操作人OpenID
         String openId = "-1";
-        if (SourceType.H5.equals(reqDto.getOrderSource())) openId = findOpenIdByToken(reqDto.getAccessToken());
+        if (!SourceType.H5.equals(reqDto.getOrderSource())) openId = findOpenIdByToken(reqDto.getAccessToken());
         sysPersistOperateLog(OperateType.ORDER_UPUSER, response.getId(), reqDto.getOrderSource(),
                 openId, "发行订单上传用户");
         return response.getCustomerId();
@@ -105,8 +105,7 @@ public class IssueOrderManageImpl extends AbstractIawManager implements IssueOrd
         if (order == null) throw new ManagerException("订单不存在");
         UploadVehicleResDTO res = new UploadVehicleResDTO();
         // 个人行驶证与办理人不一致，要求上传车主证件
-        if (UserType.PERSONAL_USER.equals(order.getUserType()) &&
-                !reqDto.getOwnerName().equals(order.getOwnerName()) && hasText(reqDto.getIdName())) {
+        if (!reqDto.getOwnerName().equals(order.getOwnerName()) && !hasText(reqDto.getIdName())) {
             res.setFlag(1);
             return res;
         }

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/product/PromotionManagerImpl.java

@@ -330,6 +330,10 @@ public class PromotionManagerImpl extends AbstractManagewManager implements Prom
         req.validate();
         IssueProductPromotion promotion = issueProductPromotionRepo.findById(req.getId()).orElse(null);
         if (promotion == null) throw new ManagerException("要审核的推广产品不存在");
+        IssueProduct product = issueProductRepo.findByReleaseId(promotion.getReleaseId());
+        if (product.getExamine()!=1 || EnableStatus.DISABLE.equals(product.getStatus())) {
+            throw new ManagerException("发行产品未上架，不可审核推广");
+        }
         promotion.setExamine(req.getExamine());
         promotion.setExamineDes(req.getExamineDes());
         if (req.getExamine() == 0) {

zhywpt-service-ods/src/main/java/cn/com/taiji/ods/manager/ois/issue/IssueCommManagerImpl.java

@@ -31,7 +31,9 @@ public abstract class IssueCommManagerImpl {
         dsiCustomerInfo.setAddress(customerInfo.getCustomerAddress());
         dsiCustomerInfo.setDepartment(customerInfo.getDepartment());
         dsiCustomerInfo.setAgentName(customerInfo.getAgentName());
-        dsiCustomerInfo.setAgentIdType(customerInfo.getAgentIdType().getCode());
+        if (customerInfo.getAgentIdType() != null) { //经办人不一定有
+            dsiCustomerInfo.setAgentIdType(customerInfo.getAgentIdType().getCode());
+        }
         dsiCustomerInfo.setAgentIdNum(customerInfo.getAgentIdNum());
         dsiCustomerInfo.setChannelId(customerInfo.getChannelId());
         dsiCustomerInfo.setStatus(customerInfo.getStatus());