联合丽格v1_0_2

src/main/java/com/caimei/modules/homepage/dao/ActiveDao.java

@@ -4,6 +4,7 @@ import com.caimei.modules.homepage.enity.Active;
 import com.caimei.modules.homepage.enity.ActiveImages;
 import com.caimei.modules.homepage.enity.BackProduct;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -25,7 +26,7 @@ public interface ActiveDao {
 
     void updateActive(Active active);
 
-    void insertImageProduct(Integer activeId, Integer imageId, Integer productId, Integer sort);
+    void insertImageProduct(@Param("activeId")Integer activeId, @Param("imageId")Integer imageId, @Param("productId") Integer productId, @Param("sort")Integer sort);
 
     List<Active> findActiveList(Active active);
 

src/main/java/com/caimei/modules/order/controller/CmOrderRemarkController.java

@@ -2,7 +2,11 @@ package com.caimei.modules.order.controller;
 
 
 import com.caimei.modules.order.entity.CmOrderRemark;
+import com.caimei.modules.order.entity.NewOrder;
+import com.caimei.modules.order.entity.NewShopOrder;
 import com.caimei.modules.order.service.CmOrderRemarkService;
+import com.caimei.modules.order.service.NewOrderService;
+import com.caimei.modules.order.util.OrderUtils;
 import com.caimei.utils.ResponseJson;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -17,6 +21,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 
 @Api(tags = "订单备注api")
@@ -27,12 +32,22 @@ public class CmOrderRemarkController {
 
 
     private final CmOrderRemarkService cmOrderRemarkService;
-
+    private final NewOrderService newOrderService;
+    private final OrderUtils orderUtil;
 
     @ApiOperation("订单备注详情")
-    @GetMapping(value = "/remarksView/{orderId}")
-    public ResponseJson<List<CmOrderRemark>> remarksView(@PathVariable("orderId") Integer orderId) {
-        List<CmOrderRemark> remarksList = cmOrderRemarkService.findList(orderId);
+    @GetMapping(value = "/remarksView/{orderId}/{shopOrderId}")
+    public ResponseJson<List<CmOrderRemark>> remarksView(@PathVariable("orderId") Integer orderId,@PathVariable("orderId") Integer shopOrderId) {
+        List<CmOrderRemark> remarksList = cmOrderRemarkService.findList(orderId).stream().filter(remark -> remark.getShopOrderId() ==shopOrderId).collect(Collectors.toList());
+        //过滤子订单
+        NewOrder newOrder = newOrderService.get(orderId.toString());
+        orderUtil.setOrderValue(newOrder);
+        List<NewShopOrder>  newShopOrders= newOrder.getNewShopOrders().stream().filter(newShopOrder -> newShopOrder.getShopOrderId() ==shopOrderId).collect(Collectors.toList());
+        newOrder.setNewShopOrders(newShopOrders);
+        if(remarksList!=null&&remarksList.size()>0){
+
+            remarksList.get(0).setNewOrder(newOrder);
+        }
         return ResponseJson.success(remarksList);
     }
 
@@ -54,4 +69,4 @@ public class CmOrderRemarkController {
     public void downFile(Integer fileId, HttpServletRequest request, HttpServletResponse response) throws IOException {
         cmOrderRemarkService.downFile(fileId, request, response);
     }
-}
+}

src/main/java/com/caimei/modules/order/controller/CmReturnedPurchaseController.java

@@ -3,6 +3,7 @@ package com.caimei.modules.order.controller;
 import com.caimei.modules.club.entity.Page;
 import com.caimei.modules.order.entity.CmReturnedPurchase;
 import com.caimei.modules.order.entity.NewOrder;
+import com.caimei.modules.order.entity.NewShopOrder;
 import com.caimei.modules.order.service.CmReturnedPurchaseService;
 import com.caimei.modules.order.service.NewOrderService;
 import com.caimei.modules.order.util.OrderUtils;
@@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @Api(tags = "退货退款api")
 @RequiredArgsConstructor
@@ -37,7 +39,7 @@ public class CmReturnedPurchaseController {
     @GetMapping(value = "list")
     public JsonModel list(CmReturnedPurchase cmReturnedPurchase, Page page) {
         PageHelper.startPage(page.getIndex(), page.getPageSize());
-        List<CmReturnedPurchase> returnedPurchaseList = cmReturnedPurchaseService.findList(cmReturnedPurchase);
+        List<CmReturnedPurchase> returnedPurchaseList = cmReturnedPurchaseService.getReturnedPurchaseList(cmReturnedPurchase);
         Page<CmReturnedPurchase> purchasePage = new Page<>(returnedPurchaseList);
         return JsonModel.newInstance().success(purchasePage);
     }
@@ -48,7 +50,10 @@ public class CmReturnedPurchaseController {
     public ResponseJson<NewOrder> toReturnRecord(@PathVariable("id") Integer id) {
         CmReturnedPurchase cmReturnedPurchase = cmReturnedPurchaseService.get(id);
         NewOrder newOrder = newOrderService.get(cmReturnedPurchase.getOrderId().toString());
-        orderUtil.setOrderPostInfo(newOrder);
+        //过滤子订单
+        orderUtil.setOrderValue(newOrder);
+        List<NewShopOrder>  newShopOrders= newOrder.getNewShopOrders().stream().filter(newShopOrder -> newShopOrder.getShopOrderId() == cmReturnedPurchase.getShopOrderId()).collect(Collectors.toList());
+        newOrder.setNewShopOrders(newShopOrders);
         newOrder.setCmReturnedPurchase(cmReturnedPurchase);
         cmReturnedPurchaseService.toReturnRecord(newOrder, cmReturnedPurchase);
         return ResponseJson.success(newOrder);
@@ -67,4 +72,4 @@ public class CmReturnedPurchaseController {
     }
 
 
-}
+}

src/main/java/com/caimei/modules/order/controller/OrderDeliverController.java

@@ -42,9 +42,9 @@ public class OrderDeliverController {
     }
 
     @ApiOperation("发货记录")
-    @GetMapping("/deliver/details/{orderId}")
-    public ResponseJson<List<LogisticsInfoVo>> logisticsDetails(@PathVariable("orderId") Integer orderId) {
-        return deliverService.findDetails(orderId);
+    @GetMapping("/deliver/details/{orderId}/{shopOrderId}")
+    public ResponseJson<List<LogisticsInfoVo>> logisticsDetails(@PathVariable("orderId") Integer orderId,@PathVariable("shopOrderId") Integer shopOrderId) {
+        return deliverService.findDetails(orderId,shopOrderId);
     }
 
     @ApiOperation("物流公司")

src/main/java/com/caimei/modules/order/controller/OrderPayShopController.java

@@ -150,8 +150,8 @@ public class OrderPayShopController {
 
     @ApiOperation("订单收付款记录")
     @ApiImplicitParam(name = "orderId", value = "订单id", required = true)
-    @GetMapping("/receipt/record/{orderId}")
-    public ResponseJson<Map<String, Object>> findReceiptRecord(@PathVariable Integer orderId) {
-        return payShopService.findReceiptRecord(orderId);
+    @GetMapping("/receipt/record/{orderId}/{shopOrderId}")
+    public ResponseJson<Map<String, Object>> findReceiptRecord(@PathVariable Integer orderId,@PathVariable Integer shopOrderId) {
+        return payShopService.findReceiptRecord(orderId,shopOrderId);
     }
 }

src/main/java/com/caimei/modules/order/controller/OrganizeOrderController.java

@@ -19,6 +19,7 @@ import org.junit.Assert;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Api(tags = "订单api")
@@ -94,6 +95,8 @@ public class OrganizeOrderController {
         map.put("bpClauses", bpClauses);
         orderUtil.setOrderValue(order);
         orderUtil.setOrderPostInfo(order);
+        order.getNewShopOrders().forEach(newShopOrder -> newShopOrder.setPostageInfo(order.getPostageInfo()));
+
         /**
          *  当主订单为【待收款】或者为线下支付的【部分收款】状态时，才显示更改订单状态按钮
          *  （排除交易全退订单）
@@ -175,8 +178,14 @@ public class OrganizeOrderController {
         Map<String, Object> map = new HashMap();
         try {
             NewOrder newOrder = newOrderService.get(cmReturnedPurchase.getOrderId().toString());
-            orderUtil.setOrderPostInfo(newOrder);
-            List<CmReturnedPurchase> dataList = cmReturnedPurchaseService.getReturnedPurchaseList(cmReturnedPurchase);
+//            orderUtil.setOrderPostInfo(newOrder);
+            //过滤子订单
+            orderUtil.setOrderValue(newOrder);
+            List<NewShopOrder>  newShopOrders= newOrder.getNewShopOrders().stream().filter(newShopOrder -> newShopOrder.getShopOrderId() == cmReturnedPurchase.getShopOrderId()).collect(Collectors.toList());
+            newOrder.setNewShopOrders(newShopOrders);
+
+
+            List<CmReturnedPurchase> dataList = cmReturnedPurchaseService.getReturnedPurchaseList(cmReturnedPurchase).stream().filter(returnedPurchase -> returnedPurchase.getShopOrderId() == cmReturnedPurchase.getShopOrderId()).collect(Collectors.toList());
             //退款(退货)总金额
             Double returnedPurchaseFee = 0D;
             //退款总额(给买家)

src/main/java/com/caimei/modules/order/dao/NewOrderDao.java

@@ -52,7 +52,7 @@ public interface NewOrderDao {
 
     void updateReceiptStatus(Integer status, String orderStatus,Integer orderId);
 
-    List<Voucher> findVoucher(Integer orderId);
+    List<Voucher> findVoucher(Integer shopOrderID);
 
     List<String> findVocherImage(Integer id);
 

src/main/java/com/caimei/modules/order/entity/CmOrderRemark.java

@@ -28,4 +28,6 @@ public class CmOrderRemark implements Serializable {
     private List<String> images;
     @ApiModelProperty("上传文件")
     private List<OssFile> ossFiles;
+    @ApiModelProperty("订单信息")
+    NewOrder newOrder;
 }

src/main/java/com/caimei/modules/order/entity/LogisticsBatch.java

@@ -34,4 +34,6 @@ public class LogisticsBatch {
     private String remark;
     @ApiModelProperty("备注图片,以##隔开")
     private String remarkImage;
+    @ApiModelProperty("订单信息")
+    NewOrder newOrder;
 }

src/main/java/com/caimei/modules/order/service/OrderDeliverService.java

@@ -18,7 +18,7 @@ public interface OrderDeliverService {
 
     ResponseJson confirmDeliver(DeliverDto dto);
 
-    ResponseJson<List<LogisticsInfoVo>> findDetails(Integer orderId);
+    ResponseJson<List<LogisticsInfoVo>> findDetails(Integer orderId,Integer shopOrderId);
 
     ResponseJson<List<CompanyVo>> getLogisticsCompany(String value);
 }

src/main/java/com/caimei/modules/order/service/PayShopService.java

@@ -37,7 +37,7 @@ public interface PayShopService {
 
     ResponseJson<Map<String,Object>> findSplitRecord(Integer orderId);
 
-    ResponseJson<Map<String,Object>> findReceiptRecord(Integer orderId);
+    ResponseJson<Map<String,Object>> findReceiptRecord(Integer orderId,Integer shopOrderId);
 
     ResponseJson backPay(Integer id);
 

src/main/java/com/caimei/modules/order/service/impl/CmReturnedPurchaseServiceImpl.java

@@ -45,6 +45,7 @@ public class CmReturnedPurchaseServiceImpl implements CmReturnedPurchaseService
             for (CmReturnedPurchase bean : dataList) {
                 CmReturnedPurchaseProduct cmReturnedPurchaseProduct = new CmReturnedPurchaseProduct();
                 cmReturnedPurchaseProduct.setReturnedId(bean.getId());
+                cmReturnedPurchaseProduct.setShopOrderId(bean.getShopOrderId());
                 List<CmReturnedPurchaseProduct> list = cmReturnedPurchaseProductDao.findList(cmReturnedPurchaseProduct);
                 for (CmReturnedPurchaseProduct item : list) {
                     //设置全路径

src/main/java/com/caimei/modules/order/service/impl/NewOrderServiceImpl.java

@@ -127,8 +127,8 @@ public class NewOrderServiceImpl implements NewOrderService {
     }
 
     @Override
-    public List<Voucher> findVoucher(Integer orderId) {
-        List<Voucher> voucher = newOrderDao.findVoucher(orderId);
+    public List<Voucher> findVoucher(Integer shopOrderID) {
+        List<Voucher> voucher = newOrderDao.findVoucher(shopOrderID);
         voucher.forEach(v -> v.setImages(newOrderDao.findVocherImage(v.getId())));
         return voucher;
     }

src/main/java/com/caimei/modules/order/service/impl/OrderDeliverServiceImpl.java

@@ -2,6 +2,7 @@ package com.caimei.modules.order.service.impl;
 
 import com.caimei.modules.order.dao.*;
 import com.caimei.modules.order.entity.*;
+import com.caimei.modules.order.service.NewOrderService;
 import com.caimei.modules.order.service.OrderDeliverService;
 import com.caimei.modules.order.util.OrderUtils;
 import com.caimei.utils.ResponseJson;
@@ -11,6 +12,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.stream.Collectors;
 
 
 /**
@@ -32,6 +34,8 @@ public class OrderDeliverServiceImpl implements OrderDeliverService {
     private LogisticsRecordDao recordDao;
     @Resource
     private LogisticsInformationDao informationDao;
+    @Resource
+    private NewOrderDao newOrderDao;
 
     @Override
     public NewOrder toDeliver(Integer orderId) {
@@ -122,10 +126,19 @@ public class OrderDeliverServiceImpl implements OrderDeliverService {
     }
 
     @Override
-    public ResponseJson<List<LogisticsInfoVo>> findDetails(Integer orderId) {
+    public ResponseJson<List<LogisticsInfoVo>> findDetails(Integer orderId ,Integer shopOrderId) {
         List<LogisticsInfoVo> result = new ArrayList<>();
         //查询这个子订单所有的发货批次记录
-        List<LogisticsBatch> lbs = logisticsBatchDao.findBatch(orderId, null);
+        List<LogisticsBatch> lbs = logisticsBatchDao.findBatch(orderId, null).stream().filter(remark -> remark.getShopOrderId() ==shopOrderId).collect(Collectors.toList());
+        //过滤子订单
+        NewOrder newOrder = newOrderDao.get(orderId.toString());
+        orderUtil.setOrderValue(newOrder);
+        List<NewShopOrder>  newShopOrders= newOrder.getNewShopOrders().stream().filter(newShopOrder -> newShopOrder.getShopOrderId() ==shopOrderId).collect(Collectors.toList());
+        newOrder.setNewShopOrders(newShopOrders);
+        if(lbs!=null&&lbs.size()>0){
+            lbs.get(0).setNewOrder(newOrder);
+        }
+
         for (LogisticsBatch l : lbs) {
             LogisticsInfoVo liv = new LogisticsInfoVo();
             // 每一批的发货商品记录

src/main/java/com/caimei/modules/order/service/impl/PayShopServiceImpl.java

@@ -23,6 +23,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
 
 
 /**
@@ -489,12 +490,20 @@ public class PayShopServiceImpl implements PayShopService {
     }
 
     @Override
-    public ResponseJson<Map<String, Object>> findReceiptRecord(Integer orderId) {
+    public ResponseJson<Map<String, Object>> findReceiptRecord(Integer orderId,Integer shopOrderId) {
         Map<String, Object> val = new HashMap<>(3);
+        //过滤子订单
         NewOrder newOrder = newOrderDao.get(orderId.toString());
         orderUtils.setReceiverVal(newOrder);
-        orderUtils.setRefundVal(newOrder);
-        orderUtils.setOrderPostInfo(newOrder);
+        orderUtils.setOrderValue(newOrder);
+//        orderUtils.setRefundVal(newOrder);
+//        orderUtils.setOrderPostInfo(newOrder);
+//        newShopOrder.getShopOrderId() == shopOrderId
+        List<NewShopOrder>  newShopOrders= newOrder.getNewShopOrders().stream().filter(newShopOrder -> newShopOrder.getShopOrderId() == shopOrderId).collect(Collectors.toList());
+        newOrder.setNewShopOrders(newShopOrders);
+        if(newOrder.getNewShopOrders()!=null&&newOrder.getNewShopOrders().size()>0){
+            newOrder.getNewShopOrders().get(0).setPostageInfo(newOrder.getPostageInfo());
+        }
         val.put("order", newOrder);
         List<ReceiptVo> receiptVos = orderUtils.getReceiptRecord(newOrder);
         val.put("receiptList", receiptVos);

src/main/java/com/caimei/modules/order/util/OrderUtils.java

@@ -445,6 +445,7 @@ public class OrderUtils {
     public List<ReceiptVo> getReceiptRecord(NewOrder newOrder) {
         ReceiptVo receiptVo = new ReceiptVo();
         receiptVo.setOrderId(newOrder.getOrderId().toString());
+
         return receiptDao.findReceiptList(receiptVo);
     }
 

src/main/resources/config/dev/application-dev.yml

@@ -12,12 +12,12 @@ spring:
     #数据源连接--start
   datasource:
     driverClassName: com.mysql.jdbc.Driver
-#    url: jdbc:mysql://192.168.2.100:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
-#    username: developer
-#    password: 05bZ/OxTB:X+yd%1
-    url: jdbc:mysql://120.79.25.27:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://192.168.2.100:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
     username: developer
-    password: J5p3tgOVazNl4ydf
+    password: 05bZ/OxTB:X+yd%1
+#    url: jdbc:mysql://120.79.25.27:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+#    username: developer
+#    password: J5p3tgOVazNl4ydf
   data:
     #mongo数据源配置
     mongodb:

src/main/resources/mapper/ActiveMapper.xml

@@ -24,7 +24,7 @@
 
     <insert id="insertImageProduct">
         insert into cm_mall_active_product(activeId, imageId, productId, sort)
-        values (#{activeId}, #{imageId}, #{productId}, #{sort})
+        values (#{activeId}, #{imageId},#{productId}, #{sort})
     </insert>
 
     <update id="updateActive">
@@ -125,14 +125,14 @@
     <select id="findProductsByImage" resultType="com.caimei.modules.homepage.enity.BackProduct">
         select DISTINCT p.name  as productName,
                         p.mainImage,
-                        cmop.id as productId,
+                        cmop.productId as productId,
                         cmop.validFlag,
                         cmp.sort
         from cm_mall_active_product cmp
-        left join cm_mall_organize_products cmop on cmp.productId = cmop.id
+        left join cm_mall_organize_products cmop on cmp.productId = cmop.productId
         left join product p on cmop.productId = p.productID
         where cmp.imageId = #{id}
     </select>
 
 
-</mapper>
+</mapper>

src/main/resources/mapper/CmMallOrganizeProductsMapper.xml

@@ -14,7 +14,7 @@
     </sql>
 
     <sql id="cmMallOrganizeProductsJoins">
-        LEFT JOIN shop s on s.shopId = p.shopId
+        LEFT JOIN shop s on s.shopId = a.shopId
         left join cm_organize_product_info copi on a.productID = copi.productId
     </sql>
 
@@ -56,7 +56,7 @@
         <include refid="cmMallOrganizeProductsColumns"/>
         FROM product a
         <include refid="cmMallOrganizeProductsJoins"/>
-        WHERE a.productID = #{id}
+        WHERE copi.organizeId=4 and a.productID = #{id}
     </select>
 
     <select id="findListBuyMall" resultType="com.caimei.modules.products.entity.CmMallOrganizeProducts">

src/main/resources/mapper/CmReturnedPurchaseMapper.xml

@@ -6,6 +6,7 @@
     <sql id="cmReturnedPurchaseColumns">
         a.id AS "id",
 		a.returnedNo AS "returnedNo",
+		a.shopOrderId AS "shopOrderId",
 		a.orderID AS "orderId",
 		a.userID AS "userId",
 		a.status AS "status",
@@ -205,4 +206,4 @@
         from cm_returned_purchase
         where id = #{id}
     </select>
-</mapper>
+</mapper>

src/main/resources/mapper/CmReturnedPurchaseProductMapper.xml

@@ -69,6 +69,9 @@
                  left join product c on c.productId = a.productId
                  left join shop d on d.shopId = a.shopId
         where a.returnedId = #{returnedId}
+        <if test="shopOrderId != null">
+            AND a.shopOrderId = #{shopOrderId}
+        </if>
     </select>
 
     <select id="getCmReturnedPurchaseProductList"
@@ -153,4 +156,4 @@
           AND a.returnedID = #{returnId}
           AND b.delFlag = 0
     </select>
-</mapper>
+</mapper>

src/main/resources/mapper/NewOrderMapper.xml

@@ -302,7 +302,7 @@
         left join cm_order_product cop on co.orderID = cop.orderID
         left join club c on co.userId = c.userId
         <where>
-            co.organizeId = #{organizeId}
+             co.organizeId = #{organizeId}
 
             <if test="orderId != null">
                 AND co.orderId = #{orderId}
@@ -702,9 +702,9 @@
     </select>
 
     <select id="findVoucher" resultType="com.caimei.modules.order.entity.Voucher">
-        select id,orderId,remarks,addTime
+        select id,shopOrderId,remarks,addTime
         from cm_order_payment_voucher
-        where orderId = #{orderId}
+        where shopOrderId = #{shopOrderID}
     </select>
 
     <select id="findVocherImage" resultType="java.lang.String">

src/main/resources/mapper/NewOrderProductMapper.xml

@@ -56,7 +56,7 @@
 		  a.`productUnit` AS `productUnit`,
 		  a.`productImage` AS `productImage`,
 		  a.`shopName` AS `shopName`,
-		  cs.costProportional AS costProportional,
+-- 		  cs.costProportional AS costProportional,
 		  cs.stock AS stock,
 		  cs.costCheckFlag AS costCheckFlag,
 		  cs.costPrice AS costPrice,
@@ -135,4 +135,4 @@
 		  and rp.status = '2'
 		  and rp.delFlag = '0'
 	</select>
-</mapper>
+</mapper>

src/main/resources/mapper/NewShopOrderMapper.xml

@@ -572,4 +572,4 @@
           and orderId = #{orderId}
           and delFlag = 0
     </select>
-</mapper>
+</mapper>