feats

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

@@ -5,20 +5,18 @@ 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.ResponseBean;
+import com.yunzhi.shigongli.common.StringUtils;
+import com.yunzhi.shigongli.entity.TaHotelAccount;
+import com.yunzhi.shigongli.vo.CommissionSettlementVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 import com.yunzhi.shigongli.service.ITaShopAccountService;
 import com.yunzhi.shigongli.entity.TaShopAccount;
-import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -38,6 +36,42 @@ public class TaShopAccountController extends BaseController {
 
     @Autowired
     public ITaShopAccountService iTaShopAccountService;
+
+    /**
+     * 佣金结算
+     * @param commissionSettlementVO
+     * @return
+     * @throws Exception
+     */
+    @PutMapping("/admin/shopAccount/commission/settlement")
+    @ApiOperation(value="佣金结算", notes = "佣金结算", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean commissionSettlement(@ApiParam("结算佣金") @RequestBody CommissionSettlementVO commissionSettlementVO) throws Exception {
+        String shopId = commissionSettlementVO.getTargetId();
+        if (StringUtils.isEmpty(shopId)) {
+            return ResponseBean.error("未找到结算民宿对象", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
+        if (null == commissionSettlementVO.getCharges() || commissionSettlementVO.getCharges() < 1) {
+            return ResponseBean.error("请设置有效的结算金额", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
+        TaShopAccount taShopAccount = iTaShopAccountService.getByShop(shopId);
+        if (null == taShopAccount) {
+            return ResponseBean.error("未找到有效的结算民宿对象", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
+        if (taShopAccount.getBrokerageCharges() - taShopAccount.getPaidCharges() < commissionSettlementVO.getCharges()) {
+            return ResponseBean.error("佣金不足", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
+        boolean success = iTaShopAccountService.commissionSettlement(taShopAccount, commissionSettlementVO.getCharges());
+        if (success) {
+            return ResponseBean.success("success");
+        } else {
+            return ResponseBean.error("结算失败请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
 //
 //
 //    /**

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

@@ -11,6 +11,7 @@ import com.yunzhi.shigongli.service.ITaMiniappQrcodeService;
 import com.yunzhi.shigongli.service.ITaPersonRecommenderService;
 import com.yunzhi.shigongli.service.ITaPersonRoleService;
 import com.yunzhi.shigongli.service.ITaPersonService;
+import com.yunzhi.shigongli.vo.WxLoginParam;
 import com.yunzhi.shigongli.vo.WxMaAuthParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -18,6 +19,7 @@ import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.time.LocalDateTime;
 import java.util.*;
 
 
@@ -60,45 +62,62 @@ public class WxMaController extends BaseController {
         result.put("openid", taPerson.getOpenid());
         result.put("sessionKey", info.getSessionKey());
 
-        if (!StringUtils.isEmpty(query)) {
-            Map<String, String> params = StringUtils.parseQueryString(query);
-
-            String fromType = params.get("fromType");
-            String recommender = params.get("recommender");
-            String qrCodeId = params.get("scene");
-
-            // 如果是扫码进入
-            if (!StringUtils.isEmpty(qrCodeId)) {
-                TaMiniappQrcode miniappQrcode = miniappQrcodeService.getById(Integer.valueOf(qrCodeId));
-                if (null != miniappQrcode) {
-                    String qrcodeParamStr = miniappQrcode.getScene();
-                    if (!StringUtils.isEmpty(qrcodeParamStr)) {
-                        // 把真正的参数返回
-                        result.put("qrcode", qrcodeParamStr);
-                        // 如果小程序码中有
-                        Map<String, String> qrcodeParams = StringUtils.parseQueryString(qrcodeParamStr);
-                        if (!StringUtils.isEmpty(qrcodeParams.get("id"))) {
-                            fromType = qrcodeParams.get("type");
-                            recommender = qrcodeParams.get("id");
-                        }
+        return ResponseBean.success(result);
+    }
+
+    @PostMapping("/login")
+    @ApiOperation(value="登录", notes = "登录", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean login(@ApiParam("登录参数") @RequestBody WxLoginParam params) throws Exception {
+        if (StringUtils.isEmpty(params.getCode()) || StringUtils.isEmpty(params.getPersonId())) {
+            return ResponseBean.error("登录参数不能为空", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
+        // 返回值
+        Map<String, Object> rtn = new HashMap<>();
+
+        WxMaJscode2SessionResult info = wxUtils.getService().getUserService().getSessionInfo(params.getCode());
+        rtn.put("sessionKey", info.getSessionKey());
+
+        TaPerson taPerson = iTaPersonService.getById(params.getPersonId());
+        rtn.put("person", taPerson);
+
+        // 查询人员角色
+        List<TaPersonRole> roleList = personRoleService.getListByPerson(taPerson.getPersonId());
+        rtn.put("personRoleList", roleList);
+
+        String fromType = params.getFromType();
+        String recommender = params.getRecommender();
+        Integer qrCodeId = params.getQrCodeId();
+        if (null != qrCodeId && qrCodeId > 0) {
+            TaMiniappQrcode miniappQrcode = miniappQrcodeService.getById(qrCodeId);
+            if (null != miniappQrcode) {
+                String qrcodeParamStr = miniappQrcode.getScene();
+                if (!StringUtils.isEmpty(qrcodeParamStr)) {
+                    // 把真正的参数返回
+                    rtn.put("qrcode", qrcodeParamStr);
+                    // 如果小程序码中有
+                    Map<String, String> qrcodeParams = StringUtils.parseQueryString(qrcodeParamStr);
+                    if (!StringUtils.isEmpty(qrcodeParams.get("id"))) {
+                        fromType = qrcodeParams.get("type");
+                        recommender = qrcodeParams.get("id");
                     }
                 }
             }
+        }
 
-            // 如果有推广ID, 比如民宿或者商铺
-            if (!StringUtils.isEmpty(recommender)) {
-                if (StringUtils.isEmpty(taPerson.getRecommender())) {
-                    taPerson.setFromType(fromType);
-                    taPerson.setRecommender(recommender);
-                    iTaPersonService.updateById(taPerson);
-                }
+        // 如果有推广ID, 比如民宿或者商铺
+        if (!StringUtils.isEmpty(recommender)) {
+            if (StringUtils.isEmpty(taPerson.getRecommender())) {
+                taPerson.setFromType(fromType);
+                taPerson.setRecommender(recommender);
+                iTaPersonService.updateById(taPerson);
+            }
 
-                // 写入推荐表
-                try {
-                    recommenderService.addNewRecommender(taPerson.getPersonId(), fromType, recommender);
-                } catch (Exception e) {
-                    e.printStackTrace();;
-                }
+            // 写入推荐表
+            try {
+                recommenderService.addNewRecommender(taPerson.getPersonId(), fromType, recommender);
+            } catch (Exception e) {
+                e.printStackTrace();;
             }
         }
 
@@ -107,27 +126,7 @@ public class WxMaController extends BaseController {
         tokenClaims.put("userId", taPerson.getPersonId());
         tokenClaims.put("miniApp", true);
         String authToken = JWTUtils.encode(tokenClaims);
-        result.put("token", authToken);
-
-        return ResponseBean.success(result);
-    }
-
-    @PostMapping("/login")
-    @ApiOperation(value="登录", notes = "登录", httpMethod = "POST", response = ResponseBean.class)
-    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());
-
-        Map<String, Object> rtn = new HashMap<>();
-        rtn.put("person", taPerson);
-        rtn.put("personRoleList", roleList);
-//        rtn.put("sessionKey", info.getSessionKey());
+        rtn.put("token", authToken);
 
         return ResponseBean.success(rtn);
     }

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

@@ -19,4 +19,6 @@ public interface TaShopAccountMapper extends BaseMapper<TaShopAccount> {
     TaShopAccount selectByShop(@Param("shopId") String shopId);
 
     int updateCommission(@Param("accountId") String accountId, @Param("amount") Integer amount);
+
+    int commissionSettlement(@Param("accountId") String accountId, @Param("charges") Integer charges);
 }

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

@@ -13,4 +13,7 @@ import com.yunzhi.shigongli.entity.TaShopAccount;
  */
 public interface ITaShopAccountService extends IBaseService<TaShopAccount> {
 
+    TaShopAccount getByShop(String shopId);
+
+    boolean commissionSettlement(TaShopAccount taShopAccount, Integer charges) throws Exception;
 }

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

@@ -8,7 +8,6 @@ import com.yunzhi.shigongli.mapper.TaPersonMapper;
 import com.yunzhi.shigongli.service.ITaPersonService;
 
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 /**
  * <p>
@@ -35,7 +34,6 @@ public class TaPersonServiceImpl extends BaseServiceImpl<TaPersonMapper, TaPerso
         return getOne(queryWrapper);
     }
 
-    @Transactional
     @Override
     public TaPerson getByOpenidOrNot(String openid) {
         TaPerson taPerson = getByOpenid(openid);

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

@@ -1,10 +1,18 @@
 package com.yunzhi.shigongli.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yunzhi.shigongli.common.Constants;
 import com.yunzhi.shigongli.entity.TaShopAccount;
+import com.yunzhi.shigongli.entity.TaShopAccountLog;
+import com.yunzhi.shigongli.mapper.TaShopAccountLogMapper;
 import com.yunzhi.shigongli.mapper.TaShopAccountMapper;
 import com.yunzhi.shigongli.service.ITaShopAccountService;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -17,4 +25,38 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaShopAccountServiceImpl extends BaseServiceImpl<TaShopAccountMapper, TaShopAccount> implements ITaShopAccountService {
 
+    @Autowired
+    TaShopAccountMapper shopAccountMapper;
+
+    @Autowired
+    TaShopAccountLogMapper shopAccountLogMapper;
+
+    @Override
+    public TaShopAccount getByShop(String shopId) {
+        LambdaQueryWrapper<TaShopAccount> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(TaShopAccount::getShopId, shopId);
+
+        return getOne(queryWrapper);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean commissionSettlement(TaShopAccount taShopAccount, Integer charges) throws Exception {
+        int cnt = shopAccountMapper.commissionSettlement(taShopAccount.getAccountId(), charges);
+        if (cnt < 1) {
+            throw new Exception("待结算佣金不足");
+        }
+
+        TaShopAccountLog accountLog = new TaShopAccountLog();
+        accountLog.setAccountId(taShopAccount.getAccountId());
+        accountLog.setShopId(taShopAccount.getShopId());
+        accountLog.setSignType(Constants.ACCOUNT_EXPENSE);
+        accountLog.setAmountType(Constants.ACCOUNT_SETTLEMENT);
+        accountLog.setAmount(-charges);
+        accountLog.setCreateDate(LocalDateTime.now());
+
+        shopAccountLogMapper.insert(accountLog);
+
+        return true;
+    }
 }

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

@@ -0,0 +1,26 @@
+package com.yunzhi.shigongli.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(description = "登录参数")
+@Data
+public class WxLoginParam {
+
+    @ApiModelProperty("personId")
+    String personId;
+
+    @ApiModelProperty("code")
+    String code;
+
+    @ApiModelProperty("来源类型")
+    String fromType;
+
+    @ApiModelProperty("推荐人")
+    String recommender;
+
+    @ApiModelProperty("二维码")
+    Integer qrCodeId;
+}

src/main/resources/mapper/TaShopAccountMapper.xml

@@ -8,6 +8,13 @@
         WHERE
             account_id = #{accountId}
     </update>
+    <update id="commissionSettlement">
+        UPDATE ta_shop_account t
+        SET t.paid_charges = t.paid_charges + #{charges}
+        WHERE
+            t.account_id = #{accountId}
+          AND t.brokerage_charges - t.paid_charges > #{charges}
+    </update>
 
     <select id="selectByShop" resultType="com.yunzhi.shigongli.entity.TaShopAccount">
         SELECT