修改林业管理

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dao/OmsOrderDao.java

@@ -27,4 +27,5 @@ public interface OmsOrderDao {
      * 获取订单详情
      */
     OmsOrderDetail getDetail(@Param("id") Long id);
+
 }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/CmsSubjectServiceImpl.java

@@ -64,6 +64,9 @@ public class CmsSubjectServiceImpl implements CmsSubjectService {
 
     @Override
     public void relateAndInsertList(List<CmsSubjectProductRelationInput> productRelationInputs, Long productId) {
+        if (productRelationInputs== null||productRelationInputs.size()<1){
+            return;
+        }
         List<CmsSubjectProductRelation> productRelationList = relationConvert(productRelationInputs, productId);
         subjectProductRelationDao.insertList(productRelationList);
     }
@@ -72,6 +75,9 @@ public class CmsSubjectServiceImpl implements CmsSubjectService {
 
     @Override
     public void relateAndUpdateList(List<CmsSubjectProductRelationInput> productRelationInputs, Long productId) {
+        if (productRelationInputs == null || productRelationInputs.size()<1){
+            return;
+        }
         List<CmsSubjectProductRelation> productRelationList = relationConvert(productRelationInputs, productId);
         //关联专题
         CmsSubjectProductRelationExample subjectProductRelationExample = new CmsSubjectProductRelationExample();

forest-admin/admin-server/src/main/resources/dao/OmsOrderDao.xml

@@ -5,6 +5,7 @@
         <collection property="orderItemList" resultMap="com.hwrj.cloud.admin.mapper.OmsOrderItemMapper.BaseResultMap" columnPrefix="item_"/>
         <collection property="historyList" resultMap="com.hwrj.cloud.admin.mapper.OmsOrderOperateHistoryMapper.BaseResultMap" columnPrefix="history_"/>
     </resultMap>
+
     <select id="getList" resultMap="com.hwrj.cloud.admin.mapper.OmsOrderMapper.BaseResultMap">
         SELECT *
         FROM
@@ -91,4 +92,4 @@
             o.id = #{id}
         ORDER BY oi.id ASC,oh.create_time DESC
     </select>
-</mapper>
+</mapper>

forest-portal/portal-server/src/main/java/com/hwrj/cloud/portal/dao/PortalOrderDao.java

@@ -27,6 +27,12 @@ public interface PortalOrderDao {
      */
     List<OmsOrderDetail> getTimeOutOrders(@Param("minute") Integer minute);
 
+
+    /**
+     * 获取个人支付成功没有收获的订单
+     * @param id 个人id（分）
+     */
+    List<OmsOrderDetail> getOwnOrders(@Param("id") Long id);
     /**
      * 批量修改订单状态
      */

forest-portal/portal-server/src/main/java/com/hwrj/cloud/portal/domain/HomeContentResult.java

@@ -33,4 +33,7 @@ public class HomeContentResult {
 
     //供应商
     private List<UmsCompanyInfoDto> companyInfos;
+
+    //个人订单
+    private List<OmsOrderDetail> ownOrderDetails;
 }

forest-portal/portal-server/src/main/java/com/hwrj/cloud/portal/domain/OmsOrderDetail.java

@@ -5,10 +5,6 @@ import com.hwrj.cloud.portal.model.OmsOrderItem;
 
 import java.util.List;
 
-/**
- * 包含订单商品信息的订单详情
- * Created by macro on 2018/9/4.
- */
 public class OmsOrderDetail extends OmsOrder {
     private List<OmsOrderItem> orderItemList;
 

forest-portal/portal-server/src/main/java/com/hwrj/cloud/portal/domain/OmsOrderDomain.java

@@ -0,0 +1,13 @@
+package com.hwrj.cloud.portal.domain;
+
+import com.hwrj.cloud.portal.model.OmsOrder;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class OmsOrderDomain extends OmsOrder {
+
+    private List<OmsOrderDetail> details;
+
+}

forest-portal/portal-server/src/main/java/com/hwrj/cloud/portal/service/OmsOrderService.java

@@ -0,0 +1,11 @@
+package com.hwrj.cloud.portal.service;
+
+import com.hwrj.cloud.portal.domain.OmsOrderDetail;
+import com.hwrj.cloud.portal.domain.OmsOrderDomain;
+
+import java.util.List;
+
+public interface OmsOrderService {
+    public List<OmsOrderDetail> getOwnNoReciveOrder();
+
+}

forest-portal/portal-server/src/main/java/com/hwrj/cloud/portal/service/impl/HomeServiceImpl.java

@@ -3,20 +3,15 @@ package com.hwrj.cloud.portal.service.impl;
 import com.github.pagehelper.PageHelper;
 import com.hwrj.cloud.common.exception.ApiException;
 import com.hwrj.cloud.portal.dao.PmsProductDao;
-import com.hwrj.cloud.portal.domain.UmsCompanyInfoDto;
+import com.hwrj.cloud.portal.domain.*;
 import com.hwrj.cloud.portal.mapper.*;
 import com.hwrj.cloud.portal.model.*;
 import com.hwrj.cloud.portal.dao.HomeDao;
-import com.hwrj.cloud.portal.domain.FlashPromotionProduct;
-import com.hwrj.cloud.portal.domain.HomeContentResult;
-import com.hwrj.cloud.portal.domain.HomeFlashPromotion;
-import com.hwrj.cloud.portal.service.CouponService;
-import com.hwrj.cloud.portal.service.HomeService;
-import com.hwrj.cloud.portal.service.SubjectService;
-import com.hwrj.cloud.portal.service.UmsCompanyInfoService;
+import com.hwrj.cloud.portal.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.jws.Oneway;
 import java.util.Date;
 import java.util.List;
 
@@ -50,6 +45,9 @@ public class HomeServiceImpl implements HomeService {
     @Autowired
     private UmsCompanyInfoService umsCompanyInfoService;
 
+    @Autowired
+    private OmsOrderService omsOrderService;
+
     @Override
     public HomeContentResult content() {
         HomeContentResult result = new HomeContentResult();
@@ -80,6 +78,12 @@ public class HomeServiceImpl implements HomeService {
         List<CmsSubject> cmsSubjects = subjectService.getRecommendSubjectList(0, 4);
         result.setSubjectList(cmsSubjects);
 //        result.setSubjectList(subjectFeign.getRecommendSubjectList(0, 4).getData());
+
+        //获取个人订单
+        List<OmsOrderDetail> order = omsOrderService.getOwnNoReciveOrder();
+        result.setOwnOrderDetails(order);
+
+
         return result;
     }
 

forest-portal/portal-server/src/main/java/com/hwrj/cloud/portal/service/impl/OmsOrderServiceImpl.java

@@ -0,0 +1,32 @@
+package com.hwrj.cloud.portal.service.impl;
+
+import com.hwrj.cloud.portal.dao.PortalOrderDao;
+import com.hwrj.cloud.portal.domain.OmsOrderDetail;
+import com.hwrj.cloud.portal.service.OmsOrderService;
+import com.hwrj.cloud.portal.service.UmsMemberService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class OmsOrderServiceImpl implements OmsOrderService {
+    @Autowired
+    private PortalOrderDao portalOrderDao;
+    @Autowired
+    private UmsMemberService umsMemberService;
+
+    @Override
+    public List<OmsOrderDetail> getOwnNoReciveOrder() {
+        try {
+            Long id = umsMemberService.getMemberId();
+            if (id == null){
+                return null;
+            }
+            List<OmsOrderDetail> orders = portalOrderDao.getOwnOrders(id);
+            return orders;
+        }catch (Exception e){
+            return null;
+        }
+    }
+}

forest-portal/portal-server/src/main/java/com/hwrj/cloud/portal/service/impl/OmsPreItemServiceImpl.java

@@ -50,7 +50,7 @@ public class OmsPreItemServiceImpl implements OmsPreItemService {
         criteria.andProductIdEqualTo(omsPreItem.getProductId());
         List<OmsPreItem> omsPreItems = omsPreItemMapper.selectByExample(example);
         if (omsPreItems != null && omsPreItems.size()>0){
-            throw new RuntimeException("已经购买过");
+            throw new RuntimeException("已经添加过有意向");
         }
 
         PmsPortalProductDetail detail = pmsPortalProductService.detail(productId);

forest-portal/portal-server/src/main/resources/dao/OmsOrderDao.xml

@@ -14,4 +14,5 @@
         WHERE
             a.order_id = #{orderId} LIMIT 1
     </select>
-</mapper>
+
+</mapper>

forest-portal/portal-server/src/main/resources/dao/PortalOrderDao.xml

@@ -47,6 +47,29 @@
             AND o.create_time < date_add(NOW(), INTERVAL -#{minute} MINUTE);
     </select>
 
+
+    <select id="getOwnOrders" resultMap="orderDetailMap">
+        SELECT
+            o.id,
+            o.order_sn,
+            o.coupon_id,
+            o.integration,
+            o.member_id,
+            o.use_integration,
+            ot.id               ot_id,
+            ot.product_name     ot_product_name,
+            ot.product_sku_id   ot_product_sku_id,
+            ot.product_sku_code ot_product_sku_code,
+            ot.product_quantity ot_product_quantity
+        FROM
+            oms_order o
+            LEFT JOIN oms_order_item ot ON o.id = ot.order_id
+        WHERE
+            o.status = 0
+            and o.member_id = #{id,jdbcType=BIGINT}
+            and o.status in (1,2);
+    </select>
+
     <update id="updateSkuStock">
         UPDATE pms_sku_stock
         SET
@@ -88,4 +111,4 @@
             #{item.productSkuId}
         </foreach>
     </update>
-</mapper>
+</mapper>