feats

src/main/java/com/yunzhi/shigongli/controller/TaHotelController.java

@@ -52,7 +52,7 @@ public class TaHotelController extends BaseController {
      * @return
      */
     @RequestMapping(value="/{plat}/taHotel",method= RequestMethod.GET)
-    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = HotelListVO.class)
     public ResponseBean taHotelList(@ApiParam(value = "客户端", allowableValues = "wx,admin") @PathVariable String plat,
                                     @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                     @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,

src/main/java/com/yunzhi/shigongli/controller/TaRoomController.java

@@ -7,6 +7,7 @@ import com.yunzhi.shigongli.common.BaseController;
 import com.yunzhi.shigongli.common.Constants;
 import com.yunzhi.shigongli.common.ResponseBean;
 import com.yunzhi.shigongli.common.StringUtils;
+import com.yunzhi.shigongli.vo.RoomListVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -61,15 +62,7 @@ public class TaRoomController extends BaseController {
         }
 
         IPage<TaRoom> pg = new Page<>(pageNum, pageSize);
-        QueryWrapper<TaRoom> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(!StringUtils.isEmpty(hotelId), "hotel_id", hotelId);
-        queryWrapper.like(!StringUtils.isEmpty(roomName), "room_name", roomName);
-        queryWrapper.eq("wx".equals(plat), "status", Constants.STATUS_NORMAL);
-        queryWrapper.gt("admin".equals(plat), "status", Constants.STATUS_DELETED);
-        queryWrapper.orderByDesc("weight");
-        queryWrapper.orderByDesc("create_date");
-
-        IPage<TaRoom> result = iTaRoomService.page(pg, queryWrapper);
+        IPage<RoomListVO> result = iTaRoomService.getPageListBy(pg, plat, hotelId, roomName);
         return ResponseBean.success(result);
     }
 

src/main/java/com/yunzhi/shigongli/controller/TaShopWorkerController.java

@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.shigongli.common.BaseController;
+import com.yunzhi.shigongli.common.Constants;
 import com.yunzhi.shigongli.common.ResponseBean;
+import com.yunzhi.shigongli.common.StringUtils;
 import com.yunzhi.shigongli.entity.TaShopWorker;
 import com.yunzhi.shigongli.service.ITaShopWorkerService;
 import io.swagger.annotations.Api;
@@ -44,14 +46,17 @@ public class TaShopWorkerController extends BaseController {
     @RequestMapping(value="/admin/taShopWorker",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taShopWorkerList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+                                         @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                         @ApiParam("商铺ID") @RequestParam(value ="shopId", required = false) String shopId) throws Exception{
 
-		    IPage<TaShopWorker> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaShopWorker> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+        IPage<TaShopWorker> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaShopWorker> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(!StringUtils.isEmpty(shopId), "shop_id", shopId);
+        queryWrapper.gt("status", Constants.STATUS_DELETED);
+        queryWrapper.orderByDesc("create_date");
 
-            IPage<TaShopWorker> result = iTaShopWorkerService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        IPage<TaShopWorker> result = iTaShopWorkerService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
     }
 
     /**

src/main/java/com/yunzhi/shigongli/controller/WxMaController.java

@@ -114,11 +114,12 @@ public class WxMaController extends BaseController {
 
     @PostMapping("/login")
     @ApiOperation(value="登录", notes = "登录", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean login(@ApiParam("登录参数") @RequestParam String code) throws Exception {
-        WxMaJscode2SessionResult info = wxUtils.getService().getUserService().getSessionInfo(code);
-
-        String openid = info.getOpenid();
-        TaPerson taPerson = iTaPersonService.getByOpenidOrNot(openid);
+    public ResponseBean login(@ApiParam("登录参数") @RequestParam String personId) throws Exception {
+//        WxMaJscode2SessionResult info = wxUtils.getService().getUserService().getSessionInfo(code);
+//
+//        String openid = info.getOpenid();
+//        TaPerson taPerson = iTaPersonService.getByOpenid(openid);
+        TaPerson taPerson = iTaPersonService.getById(personId);
 
         // 查询人员角色
         List<TaPersonRole> roleList = personRoleService.getListByPerson(taPerson.getPersonId());
@@ -126,7 +127,7 @@ public class WxMaController extends BaseController {
         Map<String, Object> rtn = new HashMap<>();
         rtn.put("person", taPerson);
         rtn.put("personRoleList", roleList);
-        rtn.put("sessionKey", info.getSessionKey());
+//        rtn.put("sessionKey", info.getSessionKey());
 
         return ResponseBean.success(rtn);
     }
@@ -156,8 +157,6 @@ public class WxMaController extends BaseController {
     @ApiOperation(value="授权手机", notes = "授权手机", httpMethod = "PUT", response = TaPerson.class)
     @PutMapping("/auth-phone")
     public ResponseBean updateUserPhone(@ApiParam("授权手机的参数") @RequestBody WxMaAuthParam params) throws Exception {
-        checkAuthParams(params);
-
         // 解密
         WxMaPhoneNumberInfo phoneNoInfo = wxUtils.getService().getUserService().getPhoneNoInfo(params.getSessionKey(), params.getEncryptedData(), params.getIv());
 

src/main/java/com/yunzhi/shigongli/entity/TaPerson.java

@@ -48,6 +48,9 @@ public class TaPerson implements Serializable {
     @ApiModelProperty(value = "手机")
     private String phone;
 
+    @ApiModelProperty(value = "当前角色")
+    private String personRole;
+
     @ApiModelProperty(value = "状态")
     private Integer status;
 

src/main/java/com/yunzhi/shigongli/mapper/TaRoomMapper.java

@@ -1,8 +1,11 @@
 package com.yunzhi.shigongli.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.shigongli.entity.TaRoom;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.shigongli.vo.RoomListVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,4 +18,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaRoomMapper extends BaseMapper<TaRoom> {
 
+    IPage<RoomListVO> getPageListBy(IPage<TaRoom> pg, @Param("plat") String plat, @Param("hotelId") String hotelId, @Param("roomName") String roomName);
 }

src/main/java/com/yunzhi/shigongli/service/ITaRoomService.java

@@ -1,6 +1,8 @@
 package com.yunzhi.shigongli.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.shigongli.entity.TaRoom;
+import com.yunzhi.shigongli.vo.RoomListVO;
 
 
 /**
@@ -13,4 +15,5 @@ import com.yunzhi.shigongli.entity.TaRoom;
  */
 public interface ITaRoomService extends IBaseService<TaRoom> {
 
+    IPage<RoomListVO> getPageListBy(IPage<TaRoom> pg, String plat, String hotelId, String roomName);
 }

src/main/java/com/yunzhi/shigongli/service/impl/TaOrderServiceImpl.java

@@ -207,15 +207,18 @@ public class TaOrderServiceImpl extends BaseServiceImpl<TaOrderMapper, TaOrder>
             // 套餐分成设置
             TaShopPackageSetting packageSetting = packageSettingMapper.selectById(packageId);
             if (null != packageSetting) {
+                // 参与分成金额 = 总金额 - 返现金额
+                Integer charges = orderSub.getCharges() - orderSub.getCashback();
+
                 // 引流分成
                 Integer trafficRate = packageSetting.getTrafficRate();
-                Integer trafficCommission = orderSub.getCharges() * (trafficRate / 1000);
+                Integer trafficCommission = charges * (trafficRate / 1000);
                 // 平台分成
                 Integer platformRate = packageSetting.getPlatformRate();
-                Integer platformCommission = orderSub.getCharges() * (platformRate / 1000);
+                Integer platformCommission = charges * (platformRate / 1000);
                 // 总提成
                 Integer commissionCharge = trafficCommission + platformCommission;
-                if (commissionCharge + orderSub.getCashback() >= orderSub.getCharges()) {
+                if (commissionCharge < 0 || commissionCharge >= charges) {
                     log.error("下单失败; 套餐[{}]抽成与返现设置有问题", packageId);
                     throw new Exception("订单中存在异常套餐, 请联系相关人员");
                 }

src/main/java/com/yunzhi/shigongli/service/impl/TaPersonServiceImpl.java

@@ -8,6 +8,7 @@ import com.yunzhi.shigongli.mapper.TaPersonMapper;
 import com.yunzhi.shigongli.service.ITaPersonService;
 
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * <p>
@@ -27,13 +28,14 @@ public class TaPersonServiceImpl extends BaseServiceImpl<TaPersonMapper, TaPerso
         }
 
         LambdaQueryWrapper<TaPerson> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(TaPerson::getOpenid, "openid");
+        queryWrapper.eq(TaPerson::getOpenid, openid);
         queryWrapper.gt(TaPerson::getStatus, Constants.STATUS_DELETED);
         queryWrapper.last("limit 1");
 
         return getOne(queryWrapper);
     }
 
+    @Transactional
     @Override
     public TaPerson getByOpenidOrNot(String openid) {
         TaPerson taPerson = getByOpenid(openid);

src/main/java/com/yunzhi/shigongli/service/impl/TaRoomServiceImpl.java

@@ -1,9 +1,12 @@
 package com.yunzhi.shigongli.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.shigongli.entity.TaRoom;
 import com.yunzhi.shigongli.mapper.TaRoomMapper;
 import com.yunzhi.shigongli.service.ITaRoomService;
 
+import com.yunzhi.shigongli.vo.RoomListVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +20,11 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaRoomServiceImpl extends BaseServiceImpl<TaRoomMapper, TaRoom> implements ITaRoomService {
 
+    @Autowired
+    TaRoomMapper taRoomMapper;
+
+    @Override
+    public IPage<RoomListVO> getPageListBy(IPage<TaRoom> pg, String plat, String hotelId, String roomName) {
+        return taRoomMapper.getPageListBy(pg, plat, hotelId, roomName);
+    }
 }

src/main/java/com/yunzhi/shigongli/vo/RoomListVO.java

@@ -0,0 +1,16 @@
+package com.yunzhi.shigongli.vo;
+
+import com.yunzhi.shigongli.entity.TaRoom;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+@ApiModel(description = "修改密码参数")
+@Data
+public class RoomListVO extends TaRoom {
+
+
+    @ApiModelProperty("民宿名称")
+    String hotelName;
+}

src/main/resources/mapper/TaRoomMapper.xml

@@ -2,4 +2,28 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.shigongli.mapper.TaRoomMapper">
 
+    <select id="getPageListBy" resultType="com.yunzhi.shigongli.vo.RoomListVO">
+        SELECT
+            t.*,
+            s.hotel_name
+        FROM
+            ta_room t
+            INNER JOIN ta_hotel s ON t.hotel_id = s.hotel_id
+        WHERE 1=1
+        <if test="hotelId != null and hotelId != ''">
+            AND t.hotel_id = #{hotelId}
+        </if>
+        <if test="roomName != null and roomName != ''">
+          AND t.room_name LIKE CONCAT( '%', #{roomName}, '%' )
+        </if>
+        <if test="plat == 'admin'">
+          AND t.`status` &gt; -1
+        </if>
+        <if test="plat == 'wx'">
+          AND t.`status` = 1
+        </if>
+        ORDER BY
+            t.weight DESC,
+            t.create_date DESC
+    </select>
 </mapper>