开通服务接口

diagbotman-service/src/main/java/com/diagbot/entity/OrderDetails.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 OrderDetails implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人，0表示无创建人值
@@ -59,12 +60,12 @@ public class OrderDetails implements Serializable {
     /**
      * 产品id
      */
-    private Integer productId;
+    private Long productId;
 
     /**
      * 用户id
      */
-    private Integer userId;
+    private Long userId;
 
     /**
      * 审核状态（0.不通过1.通过）
@@ -108,19 +109,19 @@ public class OrderDetails 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;
     }
 
@@ -148,19 +149,19 @@ public class OrderDetails implements Serializable {
         this.orderNum = orderNum;
     }
 
-    public Integer getProductId() {
+    public Long getProductId() {
         return productId;
     }
 
-    public void setProductId(Integer productId) {
+    public void setProductId(Long productId) {
         this.productId = productId;
     }
 
-    public Integer getUserId() {
+    public Long getUserId() {
         return userId;
     }
 
-    public void setUserId(Integer userId) {
+    public void setUserId(Long userId) {
         this.userId = userId;
     }
 

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

@@ -6,9 +6,7 @@ import com.diagbot.entity.LantoneProduct;
 import com.diagbot.entity.wrapper.LantoneProductWrapper;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.service.impl.LantoneProductServiceImpl;
-import com.diagbot.util.BeanUtil;
 import com.diagbot.util.UserUtils;
-import com.google.common.collect.Lists;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -91,4 +89,13 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
         IPage<LantoneProduct> diagLantoneProducts =productLine(page,userId);
         return diagLantoneProducts;
     }
+
+    /**
+     * @Description: 根据产品id查询产品
+     * @Author: wangyu
+     * @Date: 17:31 2018/9/20
+     */
+    public LantoneProduct selectLanProduct(Long id){
+        return getById(id);
+    }
 }

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

@@ -17,4 +17,13 @@ public class OrderDetailsFacade extends OrderDetailsServiceImpl{
         IPage<OrderDetails> orderDetailsIPage =this.orderDetialShow(page,orderDetails);
         return orderDetailsIPage;
     }
+
+    public boolean addOrderDetails(OrderDetails orderDetails){
+        Boolean falg =true;
+        if(!save(orderDetails)){
+            falg =false;
+            return falg;
+        }
+        return falg;
+    }
 }

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

@@ -1,7 +1,10 @@
 package com.diagbot.facade;
 
 import com.diagbot.dto.ProductAuthProgressDTO;
+import com.diagbot.entity.LantoneProduct;
+import com.diagbot.entity.OrderDetails;
 import com.diagbot.entity.ProductOrder;
+import com.diagbot.entity.ServiceInfo;
 import com.diagbot.enums.VisibleIdTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.idc.VisibleIdCreater;
@@ -9,8 +12,11 @@ import com.diagbot.service.impl.ProductOrderServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.AddOrderVO;
+import com.diagbot.vo.ProductServiceSaveVO;
+import com.diagbot.vo.ServiceSaveVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,7 +30,15 @@ import java.util.List;
 public class ProductOrderFacade extends ProductOrderServiceImpl {
 	@Autowired
 	private VisibleIdCreater visibleIdCreater;
-	
+	@Autowired
+	private OrderDetailsFacade orderDetailsFacade;
+	@Autowired
+	private ServiceInfoFacade serviceInfoFacade;
+	@Autowired
+	private LantoneProductFacade lantoneProductFacade;
+	@Autowired
+	private ProductServiceFacade productServiceFacade;
+
 	public List<ProductAuthProgressDTO> productAuthProgress(){
 		List<ProductAuthProgressDTO> retList = new ArrayList<ProductAuthProgressDTO>();
 		Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
@@ -44,16 +58,45 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
 	 * @Author: wangyu
 	 * @Date: 19:59 2018/9/18
 	 */
+	@Transactional
 	public CommonErrorCode addOrders(AddOrderVO addOrderVO){
-		/*Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());*/
+		Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
 		ProductOrder productOrder =new ProductOrder();
-		productOrder.setCreator(/*UserUtils.getCurrentPrincipleID()*/"1");
+		productOrder.setCreator(UserUtils.getCurrentPrincipleID());
 		productOrder.setGmtCreate(DateUtil.now());
 		String imgId = visibleIdCreater.getNextId(VisibleIdTypeEnum.IS_ORDER.getKey()).toString();
 		productOrder.setNum(imgId);
-		productOrder.setUserId(/*userId*/1l);
+		productOrder.setUserId(userId);
 		productOrder.setTime(DateUtil.now());
-		addOrder(productOrder);
+		if(!save(productOrder)){
+			return CommonErrorCode.FAIL;
+		}
+		for (Long o:addOrderVO.getProductId()
+				) {
+			LantoneProduct lantoneProduct = lantoneProductFacade.selectLanProduct(o);
+			if(null==lantoneProduct){
+				return CommonErrorCode.FAIL;
+			}
+			OrderDetails orderDetails =new OrderDetails();
+			orderDetails.setUserId(1l);
+			orderDetails.setOrderNum(imgId);
+			orderDetails.setGmtCreate(DateUtil.now());
+			orderDetails.setCreator("");
+			orderDetails.setProductId(o);
+			if(orderDetailsFacade.addOrderDetails(orderDetails)){
+				ServiceSaveVO serviceSaveVO =new ServiceSaveVO();
+				ProductServiceSaveVO productServiceSaveVO =new ProductServiceSaveVO();
+				serviceSaveVO.setDescription(lantoneProduct.getDecription());
+				serviceSaveVO.setName(lantoneProduct.getName());
+				serviceSaveVO.setType(1);
+				ServiceInfo serviceInfo = serviceInfoFacade.createService(serviceSaveVO);
+				productServiceSaveVO.setProductId(o);
+				productServiceSaveVO.setServiceId(serviceInfo.getId());
+				productServiceSaveVO.setType(1);
+				productServiceFacade.genProductService(productServiceSaveVO);
+			}
+		}
+
 		return CommonErrorCode.OK;
 	}
 

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

@@ -20,10 +20,4 @@ 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,10 +13,4 @@ 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/ProductOrderServiceImpl.java

@@ -17,9 +17,4 @@ 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

@@ -12,7 +12,7 @@ import javax.validation.constraints.NotBlank;
  */
 @Getter
 @Setter
-public class AddOrderVO {
+public class AddOrderVO{
     @NotBlank(message = "请输入产品Id!")
-    private Long productId;
+    private Long productId[];
 }

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

@@ -23,7 +23,7 @@
         SELECT opend.* FROM diag_opened_products opend WHERE user_id = #{userId}
     </select>
 
-    <select id="selectOpenedProducts" resultMap="BaseResultMap" parameterMap="java.util.Map">
+    <select id="selectOpenedProducts" resultMap="BaseResultMap" parameterType="java.util.Map">
         SELECT t.* FROM diag_opened_products t WHERE t.is_deleted='N'
         <if test="userId != null and userId != ''">
         and t.user_id = #{userId}

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

@@ -33,7 +33,4 @@
 		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>