适配商城端页面接口;修复客户查询翻页异常；

src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java

@@ -46,10 +46,10 @@ public class BirRoiRateController {
     private BirCenterRateService birCenterRateService;
 
 
-    /**
-     * 台账数据集
-     * @return
-     */
+//    /**
+//     * 台账数据集
+//     * @return
+//     */
 //    @GetMapping("/standingBook")
 //    public R<List<BirCenterCostRateMain>> getStandingBook(String type){
 //
@@ -142,7 +142,8 @@ public class BirRoiRateController {
 
     /**
      * 获取成本中心费率
-     * @param
+     * @param costApplyId
+     * @param policyId
      * @return
      */
     @RepeatSubmit

src/main/java/com/qs/serve/modules/goods/controller/api/GoodsSpuApi.java

@@ -62,17 +62,17 @@ public class GoodsSpuApi {
         spuWrapper.eq(GoodsSpu::getShelf,1);
         spuWrapper.orderByDesc(GoodsSpu::getSort);
         List<GoodsSpu> list = goodsSpuService.list(spuWrapper);
-        //TODO 获取价格
         return R.byPageHelperList(list);
     }
 
     /**
-     * ID查询
-     * @param id
+     * 获取详情
+     * @param id spuId
+     * @param supplierId 客户id
      * @return
      */
     @GetMapping("/getById/{id}")
-    public R<GoodsSpuVo> getById(@PathVariable("id") Long id){
+    public R<GoodsSpuVo> getById(@PathVariable("id") Long id,String supplierId){
         GoodsSpuVo goodsSpu = goodsSpuService.getVoById(id);
         //TODO 获取价格
         return R.ok(goodsSpu);

src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java

@@ -102,9 +102,8 @@ public class HisUserSupplierServiceImpl extends ServiceImpl<HisUserSupplierMappe
         List<String> supplierIds = hisUserSuppliers.stream().map(a->a.getSupplierId().toString()).collect(Collectors.toList());
         if(supplierIds.size()>0) {
             param.setSearchInIds(supplierIds);
-            PageHelper.startPage(param.getPageNum(),param.getPageSize());
             List<BmsSupplier> supplierList = bmsSupplierService.selectSupplierList(param);
-            return R.buildPageHelperList(supplierList);
+            return R.buildPageHelperList(hisUserSuppliers,supplierList);
         }else{
             return R.buildPageHelperList(new ArrayList<>());
         }

src/main/java/com/qs/serve/modules/oms/controller/api/OmsOrderApi.java

@@ -52,7 +52,7 @@ public class OmsOrderApi {
      * @return
      */
     @PostMapping("/createOrder")
-    public R<OmsConfirmOrderResult> createOrder(@RequestBody @Valid OmsOrderBo omsOrderBo){
+    public R<OmsOrder> createOrder(@RequestBody @Valid OmsOrderBo omsOrderBo){
         return R.ok(omsOrderService.createOrder(omsOrderBo));
     }
 

src/main/java/com/qs/serve/modules/oms/service/OmsOrderService.java

@@ -24,7 +24,7 @@ public interface OmsOrderService extends IService<OmsOrder> {
      * @param omsOrderBo
      * @return
      */
-    OmsConfirmOrderResult createOrder(OmsOrderBo omsOrderBo);
+    OmsOrder createOrder(OmsOrderBo omsOrderBo);
 
 }
 

src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java

@@ -1,6 +1,7 @@
 package com.qs.serve.modules.oms.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.util.AuthContextUtils;
 import com.qs.serve.common.util.CollectionUtil;
 import com.qs.serve.common.util.StringUtils;
@@ -34,6 +35,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 订单 服务实现类
@@ -100,7 +102,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper,OmsOrder> im
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public OmsConfirmOrderResult createOrder(OmsOrderBo omsOrderBo) {
+    public OmsOrder createOrder(OmsOrderBo omsOrderBo) {
         OmsConfirmOrderResult confirmOrder = this.confirmOrder(omsOrderBo);
         CreateOrderParam createOrderParam = omsOrderBo.getCreateOrderParam();
         SysUser user = sysUserService.getById(AuthContextUtils.getSysUserId());
@@ -143,7 +145,11 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper,OmsOrder> im
             orderItems.add(orderItem);
         }
         omsOrderItemService.saveBatch(orderItems);
-        return null;
+        //清空勾选的购物车
+        List<Long> cartIds = confirmOrder.getShoppingCarts().stream()
+                .map(OmsShoppingCart::getId).collect(Collectors.toList());
+        omsShoppingCartService.removeBatchByIds(cartIds);
+        return order;
     }
 
 }