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

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

@@ -1,11 +1,12 @@
 package com.diagbot.entity;
 
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * <p>
@@ -34,12 +35,12 @@ public class ProductOrder implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人，0表示无创建人值
@@ -59,12 +60,12 @@ public class ProductOrder implements Serializable {
     /**
      * 用户id
      */
-    private Integer userId;
+    private Long userId;
 
     /**
      * 下单时间（申请时间）
      */
-    private LocalDateTime time;
+    private Date time;
 
     /**
      * 订单总价
@@ -88,19 +89,19 @@ public class ProductOrder implements Serializable {
         this.isDeleted = isDeleted;
     }
 
-    public LocalDateTime getGmtCreate() {
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
 
-    public LocalDateTime getGmtModified() {
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
 
@@ -128,19 +129,19 @@ public class ProductOrder implements Serializable {
         this.num = num;
     }
 
-    public Integer getUserId() {
+    public Long getUserId() {
         return userId;
     }
 
-    public void setUserId(Integer userId) {
+    public void setUserId(Long userId) {
         this.userId = userId;
     }
 
-    public LocalDateTime getTime() {
+    public Date getTime() {
         return time;
     }
 
-    public void setTime(LocalDateTime time) {
+    public void setTime(Date time) {
         this.time = time;
     }
 

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

@@ -1,14 +1,19 @@
 package com.diagbot.facade;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.stereotype.Component;
-
 import com.diagbot.dto.ProductAuthProgressDTO;
 import com.diagbot.entity.ProductOrder;
+import com.diagbot.enums.VisibleIdTypeEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.idc.VisibleIdCreater;
 import com.diagbot.service.impl.ProductOrderServiceImpl;
+import com.diagbot.util.DateUtil;
 import com.diagbot.util.UserUtils;
+import com.diagbot.vo.AddOrderVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 订单业务
@@ -17,7 +22,8 @@ import com.diagbot.util.UserUtils;
  */
 @Component
 public class ProductOrderFacade extends ProductOrderServiceImpl {
-	
+	@Autowired
+	private VisibleIdCreater visibleIdCreater;
 	
 	public List<ProductAuthProgressDTO> productAuthProgress(){
 		List<ProductAuthProgressDTO> retList = new ArrayList<ProductAuthProgressDTO>();
@@ -33,4 +39,22 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
 		return retList;
 	}
 
+	/**
+	 * @Description: 根据用户选择的产品生成订单
+	 * @Author: wangyu
+	 * @Date: 19:59 2018/9/18
+	 */
+	public CommonErrorCode addOrders(AddOrderVO addOrderVO){
+		/*Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());*/
+		ProductOrder productOrder =new ProductOrder();
+		productOrder.setCreator(/*UserUtils.getCurrentPrincipleID()*/"1");
+		productOrder.setGmtCreate(DateUtil.now());
+		String imgId = visibleIdCreater.getNextId(VisibleIdTypeEnum.IS_ORDER.getKey()).toString();
+		productOrder.setNum(imgId);
+		productOrder.setUserId(/*userId*/1l);
+		productOrder.setTime(DateUtil.now());
+		addOrder(productOrder);
+		return CommonErrorCode.OK;
+	}
+
 }

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

@@ -1,11 +1,11 @@
 package com.diagbot.mapper;
 
-import java.util.List;
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.diagbot.dto.AuthDetailDTO;
 import com.diagbot.entity.ProductOrder;
 
+import java.util.List;
+
 /**
  * <p>
  * 订单表 Mapper 接口
@@ -20,4 +20,10 @@ public interface ProductOrderMapper extends BaseMapper<ProductOrder> {
 	
 	List<AuthDetailDTO> getOrderDetails(String orderNum);
 
+	/**
+	 * @Description: 添加用户订单
+	 * @Author: wangyu
+	 * @Date: 10:20 2018/9/20
+	 */
+	public ProductOrder addOrder(ProductOrder productOrder);
 }

diagbotman-service/src/main/java/com/diagbot/service/ProductOrderService.java

@@ -13,4 +13,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ProductOrderService extends IService<ProductOrder> {
 
+    /**
+     * @Description: 添加用户订单
+     * @Author: wangyu
+     * @Date: 10:20 2018/9/20
+     */
+    public ProductOrder addOrder(ProductOrder productOrder);
 }

diagbotman-service/src/main/java/com/diagbot/service/impl/LantoneProductServiceImpl.java

@@ -3,12 +3,17 @@ package com.diagbot.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.client.UserServiceClient;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.UserOrgDTO;
 import com.diagbot.entity.LantoneProduct;
 import com.diagbot.entity.wrapper.LantoneProductWrapper;
 import com.diagbot.mapper.LantoneProductMapper;
 import com.diagbot.service.LantoneProductService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -22,6 +27,8 @@ import java.util.Map;
  */
 @Service
 public class LantoneProductServiceImpl extends ServiceImpl<LantoneProductMapper, LantoneProduct> implements LantoneProductService {
+    @Autowired
+    private UserServiceClient userServiceClient;
     /**
      * @Description: 显示朗通产品线
      * @Author: wangyu
@@ -39,7 +46,9 @@ public class LantoneProductServiceImpl extends ServiceImpl<LantoneProductMapper,
      */
     @Override
     public IPage<LantoneProduct> selectProduct(Page<LantoneProduct> page, String name) {
-
+        List<Long> list =new ArrayList<>();
+        list.add(2l);
+        RespDTO<Map<Long,UserOrgDTO>> map = userServiceClient.getUserAndOrg(list);
         return baseMapper.selectProduct(page,name);
     }
 
@@ -48,13 +57,8 @@ public class LantoneProductServiceImpl extends ServiceImpl<LantoneProductMapper,
         return baseMapper.opendedProduct(page,map);
     }
 
-    /**
-     * @Description: 根据用户查询已开通产品
-     * @Author: zhaops
-     * @Date: 10:10 2018/9/20
-     */
     @Override
     public List<LantoneProductWrapper> opendedProductByUserId(Long userId) {
-        return baseMapper.opendedProductByUserId(userId);
+        return null;
     }
 }

diagbotman-service/src/main/java/com/diagbot/service/impl/ProductOrderServiceImpl.java

@@ -17,4 +17,9 @@ import org.springframework.stereotype.Service;
 @Service
 public class ProductOrderServiceImpl extends ServiceImpl<ProductOrderMapper, ProductOrder> implements ProductOrderService {
 
+    @Override
+    public ProductOrder addOrder(ProductOrder productOrder) {
+
+        return baseMapper.addOrder(productOrder);
+    }
 }

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

@@ -0,0 +1,18 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/9/20 10:30
+ */
+@Getter
+@Setter
+public class AddOrderVO {
+    @NotBlank(message = "请输入产品Id!")
+    private Long productId;
+}

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

@@ -5,11 +5,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.LantoneProduct;
+import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.facade.LantoneProductFacade;
+import com.diagbot.facade.ProductOrderFacade;
+import com.diagbot.vo.AddOrderVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -24,6 +28,8 @@ import org.springframework.web.bind.annotation.RestController;
 public class MoreServiceController {
     @Autowired
     private LantoneProductFacade lantoneProductFacade;
+    @Autowired
+    private ProductOrderFacade productOrderFacade;
 
     @ApiOperation(value = "根据用户id查询已开通信息", notes = "根据用户id查询已开通信息")
     @GetMapping("/showProductInfo")
@@ -32,6 +38,15 @@ public class MoreServiceController {
         IPage<LantoneProduct> diagLantoneProducts =lantoneProductFacade.productLine(page);
         return RespDTO.onSuc(diagLantoneProducts);
     }
+
+    @ApiOperation(value = "生成订单", notes = "根据用户所选择的产品生成订单")
+    @PostMapping("/addOrder")
+    @SysLogger("addOrder")
+    public RespDTO addOrder( AddOrderVO addOrderVO){
+        CommonErrorCode commonErrorCode = productOrderFacade.addOrders(addOrderVO);
+        return RespDTO.onSuc(commonErrorCode);
+    }
+
 }
 
 

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

@@ -33,4 +33,7 @@
 		and a.num=#{orderNum}
 	</select>
 
+    <insert id="addOrder" parameterType="com.diagbot.mapper.ProductOrderMapper">
+        INSERT INTO `diag_product_order` (gmt_create ,creator,`num`, `user_id`, `time`, `total_prices`) VALUES (#{gmtCreate}, #{creator}, #{num}, #{userId}, #{time},#{totalPrices})
+    </insert>
 </mapper>

pom.xml

@@ -37,7 +37,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
         <spring-cloud.version>Finchley.SR1</spring-cloud.version>
-        <mybatis-plus-boot-starter.version>3.0.3</mybatis-plus-boot-starter.version>
+        <mybatis-plus-boot-starter.version>3.0.2</mybatis-plus-boot-starter.version>
         <mybatis-spring-boot.version>1.3.2</mybatis-spring-boot.version>
         <druid.version>1.1.9</druid.version>
         <swagger.version>2.9.2</swagger.version>

user-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -55,7 +55,7 @@ public class CodeGeneration {
         StrategyConfig strategy = new StrategyConfig();
         strategy.setTablePrefix(new String[] { "sys_" });// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "user" }); // 需要生成的表
+        strategy.setInclude(new String[] { "sys_user" }); // 需要生成的表
 
         strategy.setSuperServiceClass(null);
         strategy.setSuperServiceImplClass(null);