Merge remote-tracking branch 'origin/dev/one' into dev/one

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

@@ -205,7 +205,7 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
      * @return 产品信息
      */
     public RespDTO<IPage<LantoneProduct>> index(Page page, String name) {
-        IPage<User> res = this.selectProduct(page, name);
+        IPage<LantoneProduct> res = this.selectProduct(page, name);
         return RespDTO.onSuc(res);
     }
 }

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

@@ -149,7 +149,7 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
 	 * @param productOrderVO （订单编号，机构名称，申请状态）
 	 * @return 所有订单信息
 	 */
-	public List<ProductOrderWrapper> selectAllProductOrder(ProductOrderVO productOrderVO){
+	public RespDTO<List<ProductOrderWrapper>> selectAllProductOrder(ProductOrderVO productOrderVO){
 		ProductOrderIndex productOrderIndex =new ProductOrderIndex();
 		Long curren = productOrderVO.getCurrent();
 		Long size =productOrderVO.getSize();
@@ -188,7 +188,7 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
 				bean.setAuStatus(uo.getAuStatus());
 			}
 		}
-		return list;
+		return RespDTO.onSuc(list);
 	}
 
 
@@ -215,8 +215,12 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
             // 其他 部分通过
         }
         productOrder.setAuditStatus(satus);
-        this.updateById(productOrder);
-        //TODO 更新状态值
+        productOrder.setGmtModified(DateUtil.now());
+        productOrder.setModifier(UserUtils.getCurrentPrincipleID());
+        if(!this.updateById(productOrder)){
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                    "用户订单审核状态修改失败");
+        }
         return true;
     }
 }

diagbotman-service/src/main/java/com/diagbot/mapper/LantoneProductMapper.java

@@ -27,7 +27,7 @@ public interface LantoneProductMapper extends BaseMapper<LantoneProduct> {
     IPage<LantoneProduct> productLine(Page page, @Param("userId") Long userId);
 
     /**
-     * @Description: 用户查询所有未开通产品
+     * @Description: 根据产品名称分页查询
      * @Author: wangyu
      * @Date: 9:49 2018/9/18
      */

diagbotman-service/src/main/java/com/diagbot/web/ProductOrderController.java

@@ -11,13 +11,9 @@ import com.diagbot.dto.UserAndProdutDTO;
 import com.diagbot.dto.WaitExamOrderCouDTO;
 import com.diagbot.entity.OpenedProducts;
 import com.diagbot.entity.wrapper.ProductOrderWrapper;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.exception.CommonException;
 import com.diagbot.facade.LantoneProductFacade;
 import com.diagbot.facade.OpenedProductsFacade;
 import com.diagbot.facade.ProductOrderFacade;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.UserUtils;
 import com.diagbot.vo.ModifyOpeningTimeVO;
 import com.diagbot.vo.OpenUpOnTrialVO;
 import com.diagbot.vo.ProductOrderVO;
@@ -142,8 +138,7 @@ public class ProductOrderController {
     @PostMapping("/getAllProductOrder")
     @SysLogger("getAllProductOrder")
     public RespDTO<List<ProductOrderWrapper>> getAllProductOrder(ProductOrderVO productOrderVO) {
-        List<ProductOrderWrapper> list = productOrderFacade.selectAllProductOrder(productOrderVO);
-        return RespDTO.onSuc(list);
+        return productOrderFacade.selectAllProductOrder(productOrderVO);
     }
 
     @ApiOperation(value = "客户中心-查询用户已开通的功能[by:wangfeng]", notes = "用户已开通信息")

user-service/src/main/java/com/diagbot/dto/QueryAuthProgressDTO.java

@@ -19,10 +19,10 @@ public class QueryAuthProgressDTO implements Serializable {
      */
     private static final long serialVersionUID = 1L;
 
-    private Integer status;
+    private Integer userStatus;//用户认证状态
+    
+    private String userStatusMsg;//用户认证状态信息
 
-    private Integer isReject;
-
-    private String rejectComment;
+    private String rejectComment;//认证被拒理由
 
 }

user-service/src/main/java/com/diagbot/facade/UserAuthenticationFacade.java

@@ -167,8 +167,8 @@ public class UserAuthenticationFacade extends UserAuthenticationServiceImpl {
         UserAuthentication userAuthentication = this.getOne(qw);
 
         QueryAuthProgressDTO queryAuthProgressDTO = new QueryAuthProgressDTO();
-        queryAuthProgressDTO.setStatus(userAuthentication.getStatus());
-        queryAuthProgressDTO.setIsReject(userAuthentication.getIsReject());
+        queryAuthProgressDTO.setUserStatus(userAuthentication.getStatus());
+        queryAuthProgressDTO.setUserStatusMsg(AuthStatusEnum.getName(userAuthentication.getStatus()));
         queryAuthProgressDTO.setRejectComment(userAuthentication.getRejectComment());
 
         return queryAuthProgressDTO;