新需求

src/main/java/com/huiju/estateagents/bo/request/SaveCzOrderRequestBO.java

@@ -15,4 +15,14 @@ public class SaveCzOrderRequestBO {
      * 充值金额
      */
     private Integer amount;
+
+    /**
+     * 支付方式
+     */
+    private String payType;
+
+    /**
+     * 套餐
+     */
+    private Integer packId;
 }

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -872,6 +872,11 @@ public class CommConstant {
      */
     public static final String ITEM_TYPE_REDPACKAGE = "RedPacket";
 
+    /**
+     * 小程序套餐
+     */
+    public static final String ITEM_TYPE_PACKAGE = "package";
+
     /**
      * 交易状态 成功
      */
@@ -911,4 +916,26 @@ public class CommConstant {
      * 需要替换财务联系人类型
      */
     public static final String CONCAT_TYPE_FINANCE = "finance,|,finance|finance";
+
+    /**
+     * 支付方式---微信支付
+     */
+    public static final String WX_PAY = "wxPay";
+
+    /**
+     * 支付方式---余额支付
+     */
+    public static final String ACCOUNT_BALANCE_PAY = "accountBalancePay";
+
+    /**
+     * 支付方式---对公打款
+     */
+    public static final String PUBLIC_MONEY_PAY = "publicMoneyPay";
+
+    /**
+     * 时长单位---年
+     */
+    public static final String YEAR = "year";
+
+
 }

src/main/java/com/huiju/estateagents/miniPackage/controller/SysVipPackageController.java

@@ -43,7 +43,7 @@ public class SysVipPackageController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/sysVipPackage",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/sysVipPackage",method= RequestMethod.GET)
     public ResponseBean sysVipPackageList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
         ResponseBean responseBean = new ResponseBean();
@@ -51,8 +51,7 @@ public class SysVipPackageController extends BaseController {
             //使用分页插件
 		    IPage<SysVipPackage> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<SysVipPackage> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
-
+            queryWrapper.orderByAsc("pack_id");
             IPage<SysVipPackage> result = iSysVipPackageService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
         }catch (Exception e){
@@ -113,11 +112,13 @@ public class SysVipPackageController extends BaseController {
      * @param sysVipPackage 实体对象
      * @return
      */
-    @RequestMapping(value="/sysVipPackage/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/sysVipPackage/{id}",method= RequestMethod.PUT)
     public ResponseBean sysVipPackageUpdate(@PathVariable Integer id,
                                         @RequestBody SysVipPackage sysVipPackage){
         ResponseBean responseBean = new ResponseBean();
         try {
+            sysVipPackage.setPrice(sysVipPackage.getPrice() * 100);
+            sysVipPackage.setPackId(id);
             if (iSysVipPackageService.updateById(sysVipPackage)){
                 responseBean.addSuccess(sysVipPackage);
             }else {

src/main/java/com/huiju/estateagents/miniPackage/controller/SysVipPackageMainController.java

@@ -43,7 +43,7 @@ public class SysVipPackageMainController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/sysVipPackageMain",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/sysVipPackageMain",method= RequestMethod.GET)
     public ResponseBean sysVipPackageMainList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                               @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
         ResponseBean responseBean = new ResponseBean();
@@ -51,7 +51,6 @@ public class SysVipPackageMainController extends BaseController {
             //使用分页插件
 		    IPage<SysVipPackageMain> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<SysVipPackageMain> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
 
             IPage<SysVipPackageMain> result = iSysVipPackageMainService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
@@ -113,11 +112,12 @@ public class SysVipPackageMainController extends BaseController {
      * @param sysVipPackageMain 实体对象
      * @return
      */
-    @RequestMapping(value="/sysVipPackageMain/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/sysVipPackageMain/{id}",method= RequestMethod.PUT)
     public ResponseBean sysVipPackageMainUpdate(@PathVariable Integer id,
                                         @RequestBody SysVipPackageMain sysVipPackageMain){
         ResponseBean responseBean = new ResponseBean();
         try {
+            sysVipPackageMain.setSerialNo(id);
             if (iSysVipPackageMainService.updateById(sysVipPackageMain)){
                 responseBean.addSuccess(sysVipPackageMain);
             }else {

src/main/java/com/huiju/estateagents/miniPackage/controller/TaUserPackagesController.java

@@ -1,5 +1,7 @@
 package com.huiju.estateagents.miniPackage.controller;
 
+import javax.servlet.http.HttpServletRequest;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +18,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.bo.request.SaveCzOrderRequestBO;
 import com.huiju.estateagents.miniPackage.entity.TaUserPackages;
 import com.huiju.estateagents.miniPackage.service.ITaUserPackagesService;
 
@@ -147,4 +150,23 @@ public class TaUserPackagesController extends BaseController {
         }
         return responseBean;
     }
+
+    /**
+     * 创建充值订单
+     *
+     * @param requestBO
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/taUserPackages/saveOrder", method = RequestMethod.POST)
+    public ResponseBean saveBuyPackageOrder(@RequestBody SaveCzOrderRequestBO requestBO, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaUserPackagesService.saveBuyPackageOrder(requestBO, 84, 2149, request.getRemoteAddr());
+        } catch (Exception e) {
+            logger.error("saveBuyPackageOrder -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

src/main/java/com/huiju/estateagents/miniPackage/entity/SysVipPackage.java

@@ -1,6 +1,10 @@
 package com.huiju.estateagents.miniPackage.entity;
 
 import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -23,6 +27,7 @@ public class SysVipPackage implements Serializable {
     /**
      * 套餐ID
      */
+    @TableId(value = "pack_id", type = IdType.AUTO)
     private Integer packId;
 
     /**
@@ -58,7 +63,7 @@ public class SysVipPackage implements Serializable {
     /**
      * 对应系统角色
      */
-    private Integer ruleId;
+    private Integer roleId;
 
 
 }

src/main/java/com/huiju/estateagents/miniPackage/entity/TaUserPackages.java

@@ -67,7 +67,7 @@ public class TaUserPackages implements Serializable {
     /**
      * 对应系统角色
      */
-    private Integer ruleId;
+    private Integer roleId;
 
     /**
      * 状态

src/main/java/com/huiju/estateagents/miniPackage/service/ITaUserPackagesService.java

@@ -1,5 +1,7 @@
 package com.huiju.estateagents.miniPackage.service;
 
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.bo.request.SaveCzOrderRequestBO;
 import com.huiju.estateagents.miniPackage.entity.TaUserPackages;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -12,5 +14,14 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2020-06-16
  */
 public interface ITaUserPackagesService extends IService<TaUserPackages> {
-
+    /**
+     * 购买套餐生成订单
+     * @param saveCzOrderRequestBO
+     * @param orgId
+     * @param userId
+     * @param ip
+     * @return
+     * @throws Exception
+     */
+    ResponseBean saveBuyPackageOrder(SaveCzOrderRequestBO saveCzOrderRequestBO, Integer orgId, Integer userId, String ip) throws Exception;
 }

src/main/java/com/huiju/estateagents/miniPackage/service/impl/TaUserPackagesServiceImpl.java

@@ -1,10 +1,44 @@
 package com.huiju.estateagents.miniPackage.service.impl;
 
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.bo.request.SaveCzOrderRequestBO;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.CommonUtils;
+import com.huiju.estateagents.common.wxpay.WXPay;
+import com.huiju.estateagents.common.wxpay.WXPayConstants;
+import com.huiju.estateagents.common.wxpay.WxConfig;
+import com.huiju.estateagents.entity.TaOrg;
+import com.huiju.estateagents.mapper.TaOrderMapper;
+import com.huiju.estateagents.miniPackage.entity.SysVipPackage;
 import com.huiju.estateagents.miniPackage.entity.TaUserPackages;
+import com.huiju.estateagents.miniPackage.mapper.SysVipPackageMapper;
 import com.huiju.estateagents.miniPackage.mapper.TaUserPackagesMapper;
 import com.huiju.estateagents.miniPackage.service.ITaUserPackagesService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
+import com.huiju.estateagents.redpack.entity.TaOrgAccount;
+import com.huiju.estateagents.redpack.entity.TaOrgOrder;
+import com.huiju.estateagents.redpack.entity.TaOrgOrderDetail;
+import com.huiju.estateagents.redpack.mapper.TaOrgAccountMapper;
+import com.huiju.estateagents.redpack.mapper.TaOrgOrderDetailMapper;
+import com.huiju.estateagents.redpack.mapper.TaOrgOrderMapper;
+import com.huiju.estateagents.redpack.service.ITaOrgOrderService;
 
 /**
  * <p>
@@ -17,4 +51,233 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaUserPackagesServiceImpl extends ServiceImpl<TaUserPackagesMapper, TaUserPackages> implements ITaUserPackagesService {
 
+    private final Logger logger = LoggerFactory.getLogger(TaUserPackagesServiceImpl.class);
+
+    @Value("${pay-notify}")
+    private String payNotify;
+
+    @Autowired
+    private ITaOrgOrderService iTaOrgOrderService;
+
+    @Autowired
+    private TaUserMapper taUserMapper;
+
+    @Autowired
+    private TaOrgAccountMapper taOrgAccountMapper;
+
+    @Autowired
+    private TaUserPackagesMapper taUserPackagesMapper;
+
+    @Autowired
+    private SysVipPackageMapper sysVipPackageMapper;
+
+    @Autowired
+    private TaOrgOrderMapper taOrgOrderMapper;
+
+    @Autowired
+    private TaOrgOrderDetailMapper taOrgOrderDetailMapper;
+
+    /**
+     * 购买套餐生成订单
+     * @param saveCzOrderRequestBO
+     * @param orgId
+     * @param userId
+     * @param ip
+     * @return
+     * @throws Exception
+     */
+    @Override
+    @Transactional
+    public ResponseBean saveBuyPackageOrder(SaveCzOrderRequestBO saveCzOrderRequestBO, Integer orgId, Integer userId, String ip) throws Exception {
+        ResponseBean responseBean = new ResponseBean();
+
+        SysVipPackage sysVipPackage = sysVipPackageMapper.selectById(saveCzOrderRequestBO.getPackId());
+        if (sysVipPackage == null){
+            responseBean.addError("配置不存在");
+            return responseBean;
+        }
+
+        // 获取下单人名称
+        TaUser taUser = taUserMapper.selectById(userId);
+        if (taUser == null) {
+            responseBean.addError("fail");
+            return responseBean;
+        }
+
+        //校验账户余额
+        if (CommConstant.ACCOUNT_BALANCE_PAY.equals(saveCzOrderRequestBO.getPayType())){
+            if (calculateAmountFlag(orgId, saveCzOrderRequestBO.getPackId())){
+                responseBean.addError("账户余额不足");
+                return responseBean;
+            }else {
+                //更新账户余额
+                TaOrgAccount taOrgAccount = assembleOrgAccount(orgId, saveCzOrderRequestBO.getAmount());
+                QueryWrapper<TaOrgAccount> taOrgAccountQueryWrapper = new QueryWrapper<>();
+                taOrgAccountQueryWrapper.eq("org_id", orgId);
+                taOrgAccountMapper.update(taOrgAccount, taOrgAccountQueryWrapper);
+            }
+        }
+
+        //构造订单记录
+        TaOrgOrder taOrgOrder = assembleTaOrgOrder(orgId, saveCzOrderRequestBO, taUser);
+        if (taOrgOrderMapper.insert(taOrgOrder) < 1){
+            responseBean.addError("插入订单记录失败");
+            return responseBean;
+        }
+
+        //构造订单详情记录
+        TaOrgOrderDetail taOrgOrderDetail = assembleTaOrgOrderDetail(taOrgOrder);
+        if (taOrgOrderDetailMapper.insert(taOrgOrderDetail) < 1){
+            responseBean.addError("插入订单详情记录失败");
+            return responseBean;
+        }
+
+        //构造会员套餐记录订单
+        TaUserPackages taUserPackages = assembleTaUserPackages(orgId, userId, saveCzOrderRequestBO, taOrgOrder.getOrderId());
+        if (taUserPackagesMapper.insert(taUserPackages) < 1){
+            responseBean.addError("插入会员套餐记录订单失败");
+            return responseBean;
+        }
+
+        //请求微信接口获取支付二维码
+        if (CommConstant.WX_PAY.equals(saveCzOrderRequestBO.getPayType())){
+            ResponseBean payResult = iTaOrgOrderService.payUnifiedOrder(taOrgOrder, ip, CommConstant.ITEM_TYPE_PACKAGE);
+            if (ResponseBean.CODE_SUCCESS != payResult.getCode()) {
+                return payResult;
+            }
+
+            JSONObject obj = new JSONObject();
+            obj.put("amount", sysVipPackage.getPrice());
+            obj.put("realAmount", sysVipPackage.getPrice());
+            obj.put("serviceFee", sysVipPackage.getPrice());
+            obj.put("mchPayRate", CommConstant.WXMCH_PAY_RATE_STRING);
+            obj.put("payQrCode", payResult.getData());
+            obj.put("orderInfo", taOrgOrder);
+            responseBean.addSuccess(obj);
+        }
+
+        return responseBean;
+
+    }
+
+    private TaOrgAccount assembleOrgAccount(Integer orgId, Integer amount){
+        QueryWrapper<TaOrgAccount> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("org_id", orgId);
+        TaOrgAccount selectTaOrgAccount = taOrgAccountMapper.selectOne(queryWrapper);
+
+        TaOrgAccount taOrgAccount = new TaOrgAccount();
+        taOrgAccount.setOrgId(orgId);
+        taOrgAccount.setAvailableBalance(selectTaOrgAccount.getAvailableBalance() - amount);
+        taOrgAccount.setRealBalance(selectTaOrgAccount.getRealBalance() - amount);
+        taOrgAccount.setPurchaseAmount(selectTaOrgAccount.getPurchaseAmount() + amount);
+
+        return taOrgAccount;
+    }
+
+    private boolean calculateAmountFlag(Integer orgId, Integer packId){
+        //查询账户余额
+        QueryWrapper<TaOrgAccount> taOrgAccountQueryWrapper = new QueryWrapper<>();
+        taOrgAccountQueryWrapper.eq("org_id", orgId);
+        TaOrgAccount taOrgAccount = taOrgAccountMapper.selectOne(taOrgAccountQueryWrapper);
+
+        //查询套餐价格
+        SysVipPackage sysVipPackage = sysVipPackageMapper.selectById(packId);
+        if (taOrgAccount == null || taOrgAccount.getAvailableBalance() < sysVipPackage.getPrice()){
+            return true;
+        }
+
+        return false;
+    }
+
+    public TaOrgOrder assembleTaOrgOrder(Integer orgId, SaveCzOrderRequestBO saveCzOrderRequestBO, TaUser taUser){
+        SysVipPackage sysVipPackage = sysVipPackageMapper.selectById(saveCzOrderRequestBO.getPackId());
+
+        // 1.创建订单主表信息
+        TaOrgOrder taOrgOrder = new TaOrgOrder();
+        taOrgOrder.setOrgId(orgId);
+        //类型为套餐缩写TC
+        taOrgOrder.setTradeNo(CommonUtils.generateTradeNo("TC"));
+        taOrgOrder.setAmount(sysVipPackage.getPrice());
+        taOrgOrder.setRealAmount(sysVipPackage.getPrice());
+        taOrgOrder.setCreateDate(LocalDateTime.now());
+        taOrgOrder.setExpiryDate(LocalDateTime.now().plusMinutes(30));
+        taOrgOrder.setRemark("线上购买套餐");
+        taOrgOrder.setStatus(CommConstant.STATUS_NORMAL);
+        taOrgOrder.setTradingStatus(CommConstant.TRADING_STATUS_PROCESSING);
+        taOrgOrder.setIsOffline(false);
+        taOrgOrder.setUserId(taUser.getUserId());
+        taOrgOrder.setUserName(taUser.getUserName());
+
+        return taOrgOrder;
+    }
+
+    public TaOrgOrderDetail assembleTaOrgOrderDetail(TaOrgOrder taOrgOrder){
+        // 创建订单详情表信息
+        TaOrgOrderDetail taOrgOrderDetail = new TaOrgOrderDetail();
+        taOrgOrderDetail.setOrderId(taOrgOrder.getOrderId());
+        taOrgOrderDetail.setOrgId(taOrgOrder.getOrgId());
+        taOrgOrderDetail.setItemType(CommConstant.ITEM_TYPE_PACKAGE);
+        taOrgOrderDetail.setAmount(taOrgOrder.getAmount());
+        taOrgOrderDetail.setUnitPrice(taOrgOrder.getAmount());
+        taOrgOrderDetail.setRealAmount(taOrgOrder.getAmount());
+        taOrgOrderDetail.setQuantity(1);
+        taOrgOrderDetail.setStatus(CommConstant.STATUS_NORMAL);
+
+        return taOrgOrderDetail;
+    }
+
+    public TaUserPackages assembleTaUserPackages(Integer orgId, Integer userId, SaveCzOrderRequestBO saveCzOrderRequestBO, String orderId){
+        TaUserPackages taUserPackages = selectPackagesByUserId(userId);
+        SysVipPackage sysVipPackage = sysVipPackageMapper.selectById(saveCzOrderRequestBO.getPackId());
+
+        TaUserPackages assembleTaUserPackages = new TaUserPackages();
+        assembleTaUserPackages.setOrgId(orgId);
+        assembleTaUserPackages.setUserId(userId);
+        assembleTaUserPackages.setPackId(saveCzOrderRequestBO.getPackId());
+        assembleTaUserPackages.setCreateDate(LocalDateTime.now());
+        assembleTaUserPackages.setStartDate(taUserPackages == null ? LocalDateTime.now() : taUserPackages.getEndDate());
+        assembleTaUserPackages.setEndDate(calculateEndDate(saveCzOrderRequestBO));
+        assembleTaUserPackages.setOrderId(orderId);
+        assembleTaUserPackages.setRoleId(sysVipPackage.getRoleId());
+
+        return assembleTaUserPackages;
+    }
+
+    private TaUserPackages selectPackagesByUserId(Integer userId){
+        QueryWrapper<TaUserPackages> taUserPackagesQueryWrapper = new QueryWrapper<>();
+        taUserPackagesQueryWrapper.eq("user_id", userId);
+        taUserPackagesQueryWrapper.orderByDesc("end_date");
+        List<TaUserPackages> list = taUserPackagesMapper.selectList(taUserPackagesQueryWrapper);
+        if (CollectionUtils.isEmpty(list)){
+            return null;
+        }
+        return list.get(0);
+    }
+
+    /**
+     * 根据选择的套餐计算结束时间
+     * @param saveCzOrderRequestBO
+     * @return
+     */
+    private LocalDateTime calculateEndDate(SaveCzOrderRequestBO saveCzOrderRequestBO) {
+        LocalDateTime localDateTime = LocalDateTime.now();
+        SysVipPackage sysVipPackage = sysVipPackageMapper.selectById(saveCzOrderRequestBO.getPackId());
+
+        switch (sysVipPackage.getUnit()){
+            case CommConstant.YEAR:
+                localDateTime.plusYears(Long.valueOf(sysVipPackage.getAmount()));
+                break;
+            case CommConstant.MONTH:
+                localDateTime.plusMonths(Long.valueOf(sysVipPackage.getAmount()));
+                break;
+            case CommConstant.WEEK:
+                localDateTime.plusWeeks(Long.valueOf(sysVipPackage.getAmount()));
+                break;
+            default:
+                localDateTime.plusDays(Long.valueOf(sysVipPackage.getAmount()));
+        }
+
+        return localDateTime;
+    }
+
 }

src/main/java/com/huiju/estateagents/redpack/controller/TaOrgAccountController.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.NumberUtils;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
@@ -355,7 +356,7 @@ public class TaOrgAccountController extends BaseController {
         try {
             taOrgOrder.setOrgId(getOrgId(request));
             taOrgOrder.setUserId(getUserId(request));
-            responseBean = iTaOrgOrderService.payUnifiedOrder(taOrgOrder,request.getRemoteAddr());
+            responseBean = iTaOrgOrderService.payUnifiedOrder(taOrgOrder,request.getRemoteAddr(), CommConstant.ITEM_TYPE_RECHARGE);
         } catch (Exception e) {
             log.error("微信统一下单失败： {}" , e.getMessage());
             return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_MISSING_PARAMS);

src/main/java/com/huiju/estateagents/redpack/service/ITaOrgOrderService.java

@@ -83,7 +83,7 @@ public interface ITaOrgOrderService extends IService<TaOrgOrder> {
      * @param remoteAddr
      * @return
      */
-    ResponseBean payUnifiedOrder(TaOrgOrder taOrgOrder, String remoteAddr) throws Exception;
+    ResponseBean payUnifiedOrder(TaOrgOrder taOrgOrder, String remoteAddr, String itemType) throws Exception;
 
     /**
      * 创建充值订单

src/main/java/com/huiju/estateagents/redpack/service/impl/TaOrgOrderServiceImpl.java

@@ -180,7 +180,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
      * @return
      */
     @Override
-    public ResponseBean payUnifiedOrder(TaOrgOrder taOrgOrder, String clientIp) throws Exception {
+    public ResponseBean payUnifiedOrder(TaOrgOrder taOrgOrder, String clientIp, String itemType) throws Exception {
         taOrgOrder = taOrgOrderMapper.selectById(taOrgOrder.getOrderId());
         //构建微信配置
         WxConfig config = getWxConfig(0);
@@ -205,7 +205,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         //终端IP
         data.put("spbill_create_ip", clientIp);
         //回调地址
-        data.put("notify_url", payNotify + CommConstant.ITEM_TYPE_RECHARGE);
+        data.put("notify_url", payNotify + itemType);
         // 此处指定为APP支付
         data.put("trade_type", "NATIVE");
         data.put("product_id", taOrgOrder.getOrderId());
@@ -278,7 +278,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         }
 
         // 3.请求微信接口获取支付二维码
-        ResponseBean payResult = payUnifiedOrder(taOrgOrder, ip);
+        ResponseBean payResult = payUnifiedOrder(taOrgOrder, ip, CommConstant.ITEM_TYPE_RECHARGE);
         if (ResponseBean.CODE_SUCCESS != payResult.getCode()) {
             return payResult;
         }

src/main/java/com/huiju/estateagents/service/impl/TaRoleServiceImpl.java

@@ -5,14 +5,19 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
+import com.huiju.estateagents.miniPackage.entity.TaUserPackages;
+import com.huiju.estateagents.miniPackage.mapper.TaUserPackagesMapper;
 import com.huiju.estateagents.service.ITaRoleService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.QueryTimeoutException;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import io.swagger.models.auth.In;
+
 /**
  * <p>
  * 角色表 角色表，每个org的角色可以单独设置。但是都共有一个admin角色。这个角色在创建用户的时候创建好了 服务实现类
@@ -38,6 +43,9 @@ public class TaRoleServiceImpl extends ServiceImpl<TaRoleMapper, TaRole> impleme
     @Autowired
     TaRoleButtonMapper taRoleButtonMapper;
 
+    @Autowired
+    TaUserPackagesMapper taUserPackagesMapper;
+
     @Autowired
     private TaAdvancedControllerMapper taAdvancedControllerMapper;
 
@@ -46,7 +54,16 @@ public class TaRoleServiceImpl extends ServiceImpl<TaRoleMapper, TaRole> impleme
 
     @Override
     public List<TaRole> getRolesByUser(Integer userId) {
-        return taRoleMapper.getRolesByUser(userId);
+        List<TaRole> roles = new ArrayList<>();
+        roles.addAll(taRoleMapper.getRolesByUser(userId));
+
+        //查询会员套餐记录
+        List<Integer> roleList = selectRoleListByPackageUserId(userId);
+        QueryWrapper<TaRole> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("role_id", roleList);
+        roles.addAll(taRoleMapper.selectList(queryWrapper));
+
+        return roles;
     }
 
     @Override
@@ -92,4 +109,11 @@ public class TaRoleServiceImpl extends ServiceImpl<TaRoleMapper, TaRole> impleme
         taRole.setSysMenuList(sysMenuList);
         return taRole;
     }
+
+    public List<Integer> selectRoleListByPackageUserId(Integer userId){
+        QueryWrapper<TaUserPackages> taUserPackagesQueryWrapper = new QueryWrapper<>();
+        taUserPackagesQueryWrapper.eq("user_id", userId);
+        List<TaUserPackages> taUserPackagesList = taUserPackagesMapper.selectList(taUserPackagesQueryWrapper);
+        return taUserPackagesList.stream().map(TaUserPackages::getRoleId).collect(Collectors.toList());
+    }
 }

src/main/java/com/huiju/estateagents/service/impl/WxPayServiceImpl.java

@@ -162,6 +162,9 @@ public class WxPayServiceImpl implements IWxPayService {
         }else if (type.equals(CommConstant.ITEM_TYPE_RECHARGE)){
             //账户充值
             accountRecharge(resultMap);
+        }else if (type.equals(CommConstant.ITEM_TYPE_PACKAGE)){
+            //购买套餐
+            buyPackage(resultMap);
         }
 
     }
@@ -200,6 +203,41 @@ public class WxPayServiceImpl implements IWxPayService {
         taOrgAccountMapper.updateById(taOrgAccount);
     }
 
+    /**
+     * 购买套餐
+     * @param resultMap
+     */
+    private void buyPackage(Map<String, String> resultMap){
+        log.info("修改订单为{},的支付状态",resultMap.get("out_trade_no"));
+        String tradeNo = resultMap.get("out_trade_no");
+        String transactionId = resultMap.get("transaction_id");
+        TaOrgOrder taOrgOrder = taOrgOrderMapper.selectOne(new QueryWrapper<TaOrgOrder>().eq("trade_no", tradeNo));
+        taOrgOrder.setPayDate(LocalDateTime.now());
+        taOrgOrder.setTradingStatus(CommConstant.SUCCESS);
+        taOrgOrder.setWxOrderId(transactionId);
+        taOrgOrderMapper.updateById(taOrgOrder);
+
+        //获取账户信息表
+        TaOrgAccount taOrgAccount = taOrgAccountMapper.selectOne(new QueryWrapper<TaOrgAccount>().eq("org_id", taOrgOrder.getOrgId()).eq("status", CommConstant.STATUS_NORMAL));
+        //添加账户流水
+        TaOrgAccountDetailedList taOrgAccountDetailedList = new TaOrgAccountDetailedList();
+        taOrgAccountDetailedList.setAccountId(taOrgAccount.getAccountId());
+        taOrgAccountDetailedList.setAmount(taOrgOrder.getAmount());
+        taOrgAccountDetailedList.setCreateDate(LocalDateTime.now());
+        taOrgAccountDetailedList.setOrderId(taOrgOrder.getOrderId());
+        taOrgAccountDetailedList.setOrgId(taOrgOrder.getOrgId());
+        taOrgAccountDetailedList.setSignType(1);
+        taOrgAccountDetailedList.setStatus(CommConstant.STATUS_NORMAL);
+        taOrgAccountDetailedList.setRemark("线上购买套餐");
+        taOrgAccountDetailedList.setUserId(taOrgOrder.getUserId());
+        taOrgAccountDetailedList.setUserName(taOrgOrder.getUserName());
+        taOrgAccountDetailedListMapper.insert(taOrgAccountDetailedList);
+        //添加账户金额
+        taOrgAccount.setAvailableBalance(taOrgAccount.getAvailableBalance() - taOrgOrder.getAmount());
+        taOrgAccount.setRealBalance(taOrgAccount.getRealBalance() - taOrgOrder.getAmount());
+        taOrgAccountMapper.updateById(taOrgAccount);
+    }
+
     /**
      * 微信退款
      * @param taOrder