产品申请查询所有订单信息接口完善

diagbotman-service/src/main/java/com/diagbot/entity/ProductOrderIndex.java

@@ -4,6 +4,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * <p>
@@ -45,5 +46,9 @@ public class ProductOrderIndex implements Serializable {
      * 入参页数
      */
     private Long index;
+    /**
+     * 用户id
+     */
+    private List<Long> userId;
 
 }

diagbotman-service/src/main/java/com/diagbot/facade/OrderDetailsFacade.java

@@ -63,6 +63,7 @@ public class OrderDetailsFacade extends OrderDetailsServiceImpl{
         orderDetails.setGmtModified(DateUtil.now());
         orderDetails.setModifier(UserUtils.getCurrentPrincipleID());
         orderDetails.setAuditStatus(auditStatusVO.getAuditStatus());
+        //TODO  根据订单审核状态修改主表审核状态  审核失败设置失败原因   没有线上模式时不是抛异常而是不生成token
         if(auditStatusVO.getAuditStatus()== AuditStatusEnum.Veto.getKey()){
             if(!this.updateById(orderDetails)){
                 throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,

diagbotman-service/src/main/java/com/diagbot/facade/ProductOrderFacade.java

@@ -155,7 +155,8 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
 		BeanUtil.copyProperties(productOrderVO, productOrderIndex);
 		productOrderIndex.setIndex((productOrderVO.getCurrent().longValue()-1)*productOrderVO.getSize().longValue());
 		//TODO
-        userServiceClient.getUserByOrgName(productOrderVO.getOrgName());
+		RespDTO<List<Long>> rlist = userServiceClient.getUserByOrgName(productOrderVO.getOrgName());
+		productOrderIndex.setUserId(rlist.data);
 		List<ProductOrderWrapper> list =productOrderFacade.selectAllProductOrder(productOrderIndex);
 		List<Long> list1 =new ArrayList<>();
 		for (ProductOrderWrapper productOrderWrapper:list) {

diagbotman-service/src/main/java/com/diagbot/vo/AddProductsVO.java

@@ -21,4 +21,14 @@ public class AddProductsVO {
     private String url;
     @NotBlank(message = "请输入计费方式!")
     private String chargeType;
+    @NotBlank(message = "请输入计费方式!")
+    private Integer trialStatus;
+    /**
+     * 试用路径
+     */
+    private String trialUrl;
+    /**
+     * 接入方式
+      */
+    private String accessType;
 }

diagbotman-service/src/main/resources/mapper/ProductOrderMapper.xml

@@ -84,6 +84,12 @@
         <if test="auditStatus != null and auditStatus != ''">
             AND audit_status=#{auditStatus}
         </if>
+        <if test="userId != null and userId.size > 0">
+            AND user_id IN
+            <foreach item="userId" collection="userId" open="(" separator="," close=")">
+                #{userId}
+            </foreach>
+        </if>
         LIMIT #{index},#{size}
     </select>