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

# Conflicts:
#	user-service/src/main/java/com/diagbot/facade/UserFacade.java

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

@@ -13,6 +13,7 @@ import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.LantoneProductServiceImpl;
 import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.OppendedProductVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,13 +40,13 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
      * @Author: wangyu
      * @Date: 19:59 2018/9/18
      */
-    public CommonErrorCode addProducts(LantoneProduct lantoneProduct) {
-        LantoneProduct diagLantoneProduct1 = new LantoneProduct();
-
+    public Boolean addProducts(LantoneProduct lantoneProduct) {
+        lantoneProduct.setGmtCreate(DateUtil.now());
+        lantoneProduct.setCreator(UserUtils.getCurrentPrincipleID());
         if (!save(lantoneProduct)) {
-            return CommonErrorCode.FAIL;
+            throw new CommonException(CommonErrorCode.FAIL);
         }
-        return CommonErrorCode.OK;
+        return true;
     }
 
     /**
@@ -53,11 +54,11 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
      * @Author: wangyu
      * @Date: 19:59 2018/9/18
      */
-    public CommonErrorCode updateProduct(LantoneProduct lantoneProduct) {
+    public Boolean updateProduct(LantoneProduct lantoneProduct) {
         if (!updateById(lantoneProduct)) {
-            return CommonErrorCode.FAIL;
+            throw new CommonException(CommonErrorCode.FAIL);
         }
-        return CommonErrorCode.OK;
+        return true;
     }
 
     /**
@@ -65,12 +66,12 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
      * @Author: wangyu
      * @Date: 19:59 2018/9/18
      */
-    public CommonErrorCode deleteProduct(LantoneProduct lantoneProduct) {
+    public Boolean deleteProduct(LantoneProduct lantoneProduct) {
         lantoneProduct.setIsDeleted("Y");
         if (!updateById(lantoneProduct)) {
-            return CommonErrorCode.FAIL;
+            throw new CommonException(CommonErrorCode.FAIL);
         }
-        return CommonErrorCode.OK;
+        return true;
     }
 
     /**
@@ -78,11 +79,11 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
      * @Author: wangyu
      * @Date: 19:59 2018/9/18
      */
-    public CommonErrorCode productStatus(LantoneProduct lantoneProduct) {
+    public Boolean productStatus(LantoneProduct lantoneProduct) {
         if (!updateById(lantoneProduct)) {
-            return CommonErrorCode.FAIL;
+            throw new CommonException(CommonErrorCode.FAIL);
         }
-        return CommonErrorCode.OK;
+        return true;
     }
 
     /**

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

@@ -216,14 +216,14 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
 	 * @Date: 21:39 2018/9/24
 	 */
 	@Transactional
-	public CommonErrorCode updateAuditStatus(AuditStatusVO auditStatusVO){
+	public Boolean updateAuditStatus(AuditStatusVO auditStatusVO){
 		OrderDetails orderDetails =new OrderDetails();
 		orderDetails.setId(auditStatusVO.getId());
 		orderDetails.setGmtModified(DateUtil.now());
 		orderDetails.setModifier(UserUtils.getCurrentPrincipleID());
 		orderDetails.setAuditStatus(1);
 		if(!orderDetailsFacade.updateById(orderDetails)){
-			return CommonErrorCode.FAIL;
+			throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);
 		}
 		LantoneProduct lantoneProduct =new LantoneProduct();
 		lantoneProduct.setId(auditStatusVO.getId());
@@ -237,7 +237,7 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
 		productServiceSaveVO.setServiceId(serviceInfo.getId());
 		productServiceSaveVO.setType(1);
 		productServiceFacade.genProductService(productServiceSaveVO);
-		return CommonErrorCode.OK;
+		return true;
 	}
 }
 

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

@@ -7,6 +7,7 @@ import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.LantoneProduct;
 import com.diagbot.entity.wrapper.LantoneProductWrapper;
+import com.diagbot.entity.wrapper.OpendProductWrapper;
 import com.diagbot.facade.LantoneProductFacade;
 import com.diagbot.vo.OppendedProductVO;
 import io.swagger.annotations.Api;
@@ -40,7 +41,7 @@ public class DiagLantoneProductController {
     @PostMapping("/addProducts")
     @SysLogger("addProducts")
     @Transactional
-    public RespDTO<LantoneProduct> addProducts(LantoneProduct lantoneProduct){
+    public RespDTO<Boolean> addProducts(LantoneProduct lantoneProduct){
         return RespDTO.onSuc(lantoneProductFacade.addProducts(lantoneProduct));
     }
 
@@ -49,7 +50,7 @@ public class DiagLantoneProductController {
                     "根据每页显示条数，默认 10，和当前页<br>")
     @PostMapping("/selectProduct")
     @SysLogger("selectProduct")
-    public RespDTO<LantoneProduct> selectProduct(Page page , String name){
+    public RespDTO<IPage<LantoneProduct>> selectProduct(Page page , String name){
         IPage<LantoneProduct> pages = lantoneProductFacade.selectProduct(page,name);
         return RespDTO.onSuc(pages);
     }
@@ -59,7 +60,7 @@ public class DiagLantoneProductController {
     @PostMapping("/updateProduct")
     @SysLogger("updateProduct")
     @Transactional
-    public RespDTO<LantoneProduct> updateProduct(LantoneProduct lantoneProduct){
+    public RespDTO<Boolean> updateProduct(LantoneProduct lantoneProduct){
         return RespDTO.onSuc(lantoneProductFacade.updateProduct(lantoneProduct));
     }
 
@@ -68,7 +69,7 @@ public class DiagLantoneProductController {
     @PostMapping("/deleteProduct")
     @SysLogger("deleteProduct")
     @Transactional
-    public RespDTO<LantoneProduct> deleteProduct(LantoneProduct lantoneProduct){
+    public RespDTO<Boolean> deleteProduct(LantoneProduct lantoneProduct){
         return RespDTO.onSuc(lantoneProductFacade.deleteProduct(lantoneProduct));
     }
 
@@ -77,7 +78,7 @@ public class DiagLantoneProductController {
     @PostMapping("/productStatus")
     @SysLogger("productStatus")
     @Transactional
-    public RespDTO<LantoneProduct> productStatus(LantoneProduct lantoneProduct){
+    public RespDTO<Boolean> productStatus(LantoneProduct lantoneProduct){
         return RespDTO.onSuc(lantoneProductFacade.productStatus(lantoneProduct));
     }
 
@@ -88,7 +89,7 @@ public class DiagLantoneProductController {
     )
     @PostMapping("/opendedProduct")
     @SysLogger("opendedProduct")
-    public RespDTO<LantoneProduct> opendedProduct(OppendedProductVO oppendedProductVO){
+    public RespDTO<List<OpendProductWrapper>> opendedProduct(OppendedProductVO oppendedProductVO){
 
         return RespDTO.onSuc(lantoneProductFacade.opendedProduct(oppendedProductVO));
     }
@@ -96,7 +97,7 @@ public class DiagLantoneProductController {
     @ApiOperation(value = "根据用户id查询当前用户已开通产品[by:zhaops]")
     @PostMapping("/opendedProductByCurrentUser")
     @SysLogger("opendedProductByCurrentUser")
-    public RespDTO opendedProductByCurrentUser() {
+    public RespDTO<List<LantoneProductWrapper>> opendedProductByCurrentUser() {
         List<LantoneProductWrapper> list = lantoneProductFacade.opendedProductByCurrentUser();
         return RespDTO.onSuc(list);
     }

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

@@ -30,7 +30,7 @@ public class DiagOrderDetailsController {
     @ApiOperation(value = "根据订单编号查询订单明细[by:wangyu]", notes = "orderNum订单编号  必填<br>")
     @PostMapping("/orderDetialShow")
     @SysLogger("orderDetialShow")
-    public RespDTO<OrderDetails> orderDetialShow(Page page,OrderDetails orderDetails){
+    public RespDTO<IPage<OrderDetails>> orderDetialShow(Page page,OrderDetails orderDetails){
         IPage<OrderDetails> orderDetailsIPage = orderDetailsFacade.orderDetialShows(page,orderDetails);
         return RespDTO.onSuc(orderDetailsIPage);
     }

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

@@ -35,7 +35,7 @@ public class MoreServiceController {
     @ApiOperation(value = "根据用户id查询已开通信息[by:wangyu]", notes = "根据用户id查询已开通信息")
     @PostMapping("/showProductInfo")
     @SysLogger("showProductInfo")
-    public RespDTO<LantoneProduct> showProductInfo(Page page){
+    public RespDTO<IPage<LantoneProduct>> showProductInfo(Page page){
         IPage<LantoneProduct> diagLantoneProducts =lantoneProductFacade.productLine(page);
         return RespDTO.onSuc(diagLantoneProducts);
     }
@@ -44,7 +44,7 @@ public class MoreServiceController {
     @PostMapping("/addOrder")
     @SysLogger("addOrder")
     @Transactional
-    public RespDTO addOrder( @RequestBody AddOrderVO addOrderVO){
+    public RespDTO<Boolean> addOrder( @RequestBody AddOrderVO addOrderVO){
         return RespDTO.onSuc(productOrderFacade.addOrders(addOrderVO));
     }
 

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

@@ -176,7 +176,7 @@ public class ProductOrderController {
 							"status:订单状态（0.未付款1.已付款）")
 	@PostMapping("/getAllOrderDetials")
 	@SysLogger("getAllOrderDetials")
-	public RespDTO getAllOrderDetials(OrderDetialsVO orderDetialsVO) {
+	public RespDTO<List<OrderDetailsWapper>> getAllOrderDetials(OrderDetialsVO orderDetialsVO) {
 		List<OrderDetailsWapper> list = productOrderFacade.getAllOrderDetials(orderDetialsVO);
 		return RespDTO.onSuc(list);
 	}
@@ -188,7 +188,7 @@ public class ProductOrderController {
 							"status:订单状态（0.未付款1.已付款）")
 	@PostMapping("/getAllProductOrder")
 	@SysLogger("getAllProductOrder")
-	public RespDTO getAllProductOrder(ProductOrderVO productOrderVO) {
+	public RespDTO<List<ProductOrderWrapper>> getAllProductOrder(ProductOrderVO productOrderVO) {
 		List<ProductOrderWrapper> list = productOrderFacade.selectAllProductOrder(productOrderVO);
 		return RespDTO.onSuc(list);
 	}
@@ -198,7 +198,7 @@ public class ProductOrderController {
 					"id:订单明细id，根据订单明细id修改审核状态，必填<br>")
 	@PostMapping("/auditStatus")
 	@SysLogger("auditStatus")
-	public RespDTO auditStatus(AuditStatusVO auditStatusVO) {
+	public RespDTO<Boolean> auditStatus(AuditStatusVO auditStatusVO) {
 		return RespDTO.onSuc(productOrderFacade.updateAuditStatus(auditStatusVO));
 	}
 }

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

@@ -35,7 +35,6 @@ import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Component;
 
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;