新增日志字段

fuint-application/src/main/java/com/fuint/common/service/impl/OrderServiceImpl.java

@@ -226,7 +226,7 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
     /**
      * 保存订单信息
      *
-     * @param orderDto
+     * @param  orderDto
      * @throws BusinessCheckException
      */
     @Override
@@ -987,8 +987,8 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
             params.put("ORDER_ID", orderInfo.getId());
             List<MtOrderGoods> orderGoodsList = mtOrderGoodsMapper.selectByMap(params);
             for (MtOrderGoods orderGoods : orderGoodsList) {
-                MtGoods goodsInfo = mtGoodsMapper.selectById(orderGoods.getGoodsId());
-                if (goodsInfo != null) {
+                 MtGoods goodsInfo = mtGoodsMapper.selectById(orderGoods.getGoodsId());
+                 if (goodsInfo != null) {
                     OrderGoodsDto orderGoodsDto = new OrderGoodsDto();
                     orderGoodsDto.setId(orderGoods.getId());
                     orderGoodsDto.setName(goodsInfo.getName());
@@ -1006,7 +1006,7 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
                         orderGoodsDto.setSpecList(specList);
                     }
                     goodsList.add(orderGoodsDto);
-                }
+                 }
             }
         }
 

fuint-application/src/main/java/com/fuint/common/service/impl/StoreServiceImpl.java

@@ -72,6 +72,10 @@ public class StoreServiceImpl extends ServiceImpl<MtStoreMapper, MtStore> implem
         if (StringUtils.isNotBlank(status)) {
             lambdaQueryWrapper.eq(MtStore::getStatus, status);
         }
+        String merchantId = paginationRequest.getSearchParams().get("merchantId") == null ? "" : paginationRequest.getSearchParams().get("merchantId").toString();
+        if (StringUtils.isNotBlank(merchantId)) {
+            lambdaQueryWrapper.eq(MtStore::getMerchantId, merchantId);
+        }
         String storeId = paginationRequest.getSearchParams().get("storeId") == null ? "" : paginationRequest.getSearchParams().get("storeId").toString();
         if (StringUtils.isNotBlank(storeId)) {
             lambdaQueryWrapper.eq(MtStore::getId, storeId);

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendActionLogController.java

@@ -14,6 +14,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
@@ -40,7 +41,7 @@ public class BackendActionLogController extends BaseController {
      * @return
      */
     @ApiOperation(value = "操作日志列表")
-    @RequestMapping(value = "/list")
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
     public ResponseObject list(HttpServletRequest request) {
         String token = request.getHeader("Access-Token");
         Integer page = request.getParameter("page") == null ? Constants.PAGE_NUMBER : Integer.parseInt(request.getParameter("page"));