收银点更改

pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/MerchantCashPlaceController.java

@@ -2,25 +2,26 @@ package cn.pluss.platform.controller.merchant;
 
 import cn.pluss.platform.api.Result;
 import cn.pluss.platform.api.ResultGenerator;
-import cn.pluss.platform.entity.MerchantCashPayCode;
-import cn.pluss.platform.entity.MerchantCashPlace;
-import cn.pluss.platform.entity.MerchantCashPlaceStaff;
+import cn.pluss.platform.entity.*;
 import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.mapper.MerchantChannelMapper;
 import cn.pluss.platform.merchant.MerchantCashPlaceService;
 import cn.pluss.platform.merchant.MerchantCashPlaceStaffService;
 import cn.pluss.platform.vo.MerchantCashPlaceStaffVO;
 import cn.pluss.platform.vo.MerchantCashPlaceVO;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.api.R;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.Setter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
-/**
+/** 收银点
  * @author DJH
  */
 @RestController
@@ -32,6 +33,8 @@ public class MerchantCashPlaceController {
 
     @Setter(onMethod_ = {@Autowired})
     private MerchantCashPlaceStaffService cashPlaceStaffService;
+    @Resource
+    private MerchantChannelMapper merchantChannelMapper;
 
     @PostMapping
     public Result<Object> add(@RequestBody MerchantCashPlace merchantCashPlace) {
@@ -50,6 +53,13 @@ public class MerchantCashPlaceController {
         return ResultGenerator.genSuccessResult("操作成功", null);
     }
 
+    /**
+     * （新）收银点列表
+     * @param current
+     * @param size
+     * @param merchantCashPlace
+     * @return
+     */
     @GetMapping("/list")
     public Result<Object> list(Long current, Long size, MerchantCashPlace merchantCashPlace) {
         Page<MerchantCashPlace> page = new Page<>();
@@ -59,7 +69,8 @@ public class MerchantCashPlaceController {
             page.setCurrent(current);
             page.setSize(size);
         }
-        List<MerchantCashPlaceVO> result = cashPlaceService.getListForApp(page, merchantCashPlace);
+//        List<MerchantCashPlaceVO> result = cashPlaceService.getListForApp(page, merchantCashPlace);
+        List<MerchantCashPlaceVO> result = cashPlaceService.getListForBase(current.intValue(),size.intValue(), merchantCashPlace.getMerchantCode(),merchantCashPlace.getName());
         return ResultGenerator.genSuccessResult(result);
     }
 
@@ -113,4 +124,43 @@ public class MerchantCashPlaceController {
             throw new MsgException("输入内容过长");
         }
     }
+
+    /**
+     * (新)增加收银点
+     * @return
+     */
+    @PostMapping("/add")
+    public Result<Object> add(@RequestBody MerchantBaseInfo merchantBaseInfo){
+        //判定字符位数
+        if (Objects.equals(merchantBaseInfo.getAddress(), null) || Objects.equals(merchantBaseInfo.getAlias(), null)){
+            throw new MsgException("地址或收银点名称不能为空");
+        }
+        Boolean aBoolean = cashPlaceService.addCashPlace(merchantBaseInfo);
+        if (aBoolean){
+            return ResultGenerator.genSuccessResult("");
+        }
+        return ResultGenerator.genFailResult("增加失败");
+    }
+
+    /**
+     * 通道详情
+     * @return
+     */
+    @GetMapping("/channel")
+    public Result<Object> channel(@RequestParam String merchantCode){
+        List<MerchantChannel> merchantChannels = merchantChannelMapper.selectList();
+        List<MerchantChannel> merchantChannelVo = cashPlaceService.merchantChannel(merchantCode, merchantChannels);
+        return ResultGenerator.genSuccessResult(merchantChannelVo);
+    }
+
+    /**
+     * 切换收银点
+     * @return
+     */
+    @GetMapping("/cutChannel")
+    public Result<Object> cutChannel(@RequestParam String merchantCode,
+                                     @RequestParam String code){
+        cashPlaceStaffService.cutChannel(merchantCode, code);
+        return ResultGenerator.genSuccessResult();
+    }
 }