新需求

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

@@ -1,18 +1,5 @@
 package com.huiju.estateagents.redpack.controller;
 
-import javax.servlet.http.HttpServletRequest;
-
-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.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -24,6 +11,13 @@ import com.huiju.estateagents.redpack.entity.TaOrgOrder;
 import com.huiju.estateagents.redpack.entity.TaOrgRefundApplication;
 import com.huiju.estateagents.redpack.service.ITaOrgAccountService;
 import com.huiju.estateagents.redpack.service.ITaOrgOrderService;
+import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
 
 /**
  * <p>
@@ -33,6 +27,7 @@ import com.huiju.estateagents.redpack.service.ITaOrgOrderService;
  * @author fxf
  * @since 2020-06-03
  */
+@Slf4j
 @RestController
 @RequestMapping("/api")
 public class TaOrgAccountController extends BaseController {
@@ -244,4 +239,25 @@ public class TaOrgAccountController extends BaseController {
         }
         return responseBean;
     }
+
+    /**
+     * 微信统一下单接口
+     * @param taOrgOrder
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/unifiedOrder",method = RequestMethod.POST)
+    public ResponseBean wxUnifiedOrder(@RequestBody TaOrgOrder taOrgOrder,
+                                       HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taOrgOrder.setOrgId(getOrgId(request));
+            taOrgOrder.setUserId(getUserId(request));
+            responseBean = iTaOrgOrderService.payUnifiedOrder(taOrgOrder,request.getRemoteAddr());
+        } catch (Exception e) {
+            log.error("微信统一下单失败： {}" , e.getMessage());
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_MISSING_PARAMS);
+        }
+        return responseBean;
+    }
 }

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

@@ -1,13 +1,13 @@
 package com.huiju.estateagents.redpack.service;
 
-import java.time.LocalDate;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.redpack.entity.TaOrgOrder;
 import com.huiju.estateagents.redpack.entity.TaOrgRefundApplication;
 
+import java.time.LocalDate;
+
 /**
  * <p>
  * 组织订单表  服务类
@@ -43,4 +43,12 @@ public interface ITaOrgOrderService extends IService<TaOrgOrder> {
      * @return
      */
     IPage<TaOrgOrder> listByCondition(IPage<TaOrgOrder> pg, String orderType, Integer orgId, String tradeNo, Integer isOffline, String tradingStatus, String receivePhone, String itemType, LocalDate startDate, LocalDate endDate);
+
+    /**
+     * 微信支付
+     * @param taOrgOrder
+     * @param remoteAddr
+     * @return
+     */
+    ResponseBean payUnifiedOrder(TaOrgOrder taOrgOrder, String remoteAddr) throws Exception;
 }

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

@@ -1,15 +1,5 @@
 package com.huiju.estateagents.redpack.service.impl;
 
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -18,21 +8,31 @@ 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.redpack.entity.TaOrgAccount;
-import com.huiju.estateagents.redpack.entity.TaOrgAccountBlocked;
-import com.huiju.estateagents.redpack.entity.TaOrgAccountCertificate;
-import com.huiju.estateagents.redpack.entity.TaOrgAccountDetailedList;
-import com.huiju.estateagents.redpack.entity.TaOrgOrder;
-import com.huiju.estateagents.redpack.entity.TaOrgOrderDetail;
-import com.huiju.estateagents.redpack.entity.TaOrgRefundApplication;
-import com.huiju.estateagents.redpack.mapper.TaOrgAccountBlockedMapper;
-import com.huiju.estateagents.redpack.mapper.TaOrgAccountCertificateMapper;
-import com.huiju.estateagents.redpack.mapper.TaOrgAccountDetailedListMapper;
-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.mapper.TaOrgRefundApplicationMapper;
+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.TaWxPayConfig;
+import com.huiju.estateagents.mapper.TaWxPayConfigMapper;
+import com.huiju.estateagents.redpack.entity.*;
+import com.huiju.estateagents.redpack.mapper.*;
 import com.huiju.estateagents.redpack.service.ITaOrgOrderService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+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 java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -42,9 +42,13 @@ import com.huiju.estateagents.redpack.service.ITaOrgOrderService;
  * @author fxf
  * @since 2020-06-03
  */
+@Slf4j
 @Service
 public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOrder> implements ITaOrgOrderService {
 
+    @Value("${pay-notify}")
+    private String payNotify;
+
     @Autowired
     private TaOrgAccountMapper taOrgAccountMapper;
 
@@ -69,6 +73,9 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
     @Autowired
     private TaUserMapper taUserMapper;
 
+    @Autowired
+    private TaWxPayConfigMapper taWxPayConfigMapper;
+
     @Override
     public IPage<TaOrgOrder> listByCondition(IPage<TaOrgOrder> pg, String orderType, Integer orgId, String tradeNo, Integer isOffline, String tradingStatus, String receivePhone, String itemType, LocalDate startDate, LocalDate endDate) {
         IPage<TaOrgOrder> result = null;
@@ -84,6 +91,87 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         }
     }
 
+    /**
+     * 微信支付
+     *
+     * @param taOrgOrder
+     * @param clientIp
+     * @return
+     */
+    @Override
+    public ResponseBean payUnifiedOrder(TaOrgOrder taOrgOrder, String clientIp) throws Exception {
+        taOrgOrder = taOrgOrderMapper.selectById(taOrgOrder.getOrderId());
+        //构建微信配置
+        WxConfig config = getWxConfig(0);
+        WXPay wxpay = new WXPay(config);
+
+        //获取支付的钱数并且判断是自动锁房还是手动锁房,自动锁房需要锁定房源，手动锁房跳过
+        String payPrice = String.valueOf(taOrgOrder.getAmount());
+
+        //生成商户订单
+//        String tradeNo = CommonUtils.generateTradeNo("CJ");
+//        taOrgOrder.setTradeNo(tradeNo);
+
+        //下单
+        Map<String, String> data = new HashMap<String, String>();
+        data.put("body", "微信支付");
+        //商品号唯一
+        data.put("out_trade_no", taOrgOrder.getTradeNo());
+        data.put("device_info", "");
+        data.put("fee_type", "CNY");
+        //金额 后台计算
+        data.put("total_fee", payPrice);
+        //终端IP
+        data.put("spbill_create_ip", clientIp);
+        //回调地址
+        data.put("notify_url", payNotify+CommConstant.ITEM_TYPE_RECHARGE);
+        // 此处指定为APP支付
+        data.put("trade_type", "NATIVE");
+        Map<String, String> resp = wxpay.unifiedOrder(data);
+        log.info("下单成功：{}", resp);
+        if (resp.get("result_code").equalsIgnoreCase(WXPayConstants.FAIL)){
+            throw new Exception(resp.get("err_code_des"));
+        }
+
+        return ResponseBean.success(resp.get("code_url"));
+    }
+
+    /**
+     * 获取每个小程序独立的微信账户
+     * @param orgId
+     * @return
+     */
+    private WxConfig getWxConfig(Integer orgId) throws Exception {
+        //根据orgId获取支付配置
+        QueryWrapper<TaWxPayConfig> taWxPayConfigQueryWrapper = new QueryWrapper<>();
+        taWxPayConfigQueryWrapper.eq("org_id",orgId);
+        TaWxPayConfig taWxPayConfig = taWxPayConfigMapper.selectOne(taWxPayConfigQueryWrapper);
+        if (null == taWxPayConfig){
+            throw new Exception("请先完善支付信息");
+        }
+        log.info("正在配置orgId为{}的微信支付参数，商户号为{}",orgId,taWxPayConfig.getMchId());
+        //把库里的值赋值给微信
+        URL urlConet = new URL(taWxPayConfig.getApiPath());
+        HttpURLConnection con = (HttpURLConnection)urlConet.openConnection();
+        con.setRequestMethod("GET");
+        con.setConnectTimeout(4 * 1000);
+        InputStream inStream = con .getInputStream();
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        byte[] buffer = new byte[2048];
+        int len = 0;
+        while( (len=inStream.read(buffer)) != -1 ){
+            outStream.write(buffer, 0, len);
+        }
+        inStream.close();
+
+        WxConfig config = new WxConfig();
+        config.setAppid(taWxPayConfig.getAppid());
+        config.setMachId(taWxPayConfig.getMchId());
+        config.setCertData(outStream.toByteArray());
+        config.setKey(taWxPayConfig.getMchKey());
+        return config;
+    }
+
     @Override
     @Transactional(rollbackFor = {RuntimeException.class})
     public ResponseBean refundOrder(String id, TaOrgRefundApplication refundApplication, Integer userId) {

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

@@ -9,6 +9,12 @@ import com.huiju.estateagents.eContract.entity.TaContractBusiness;
 import com.huiju.estateagents.eContract.mapper.TaContractMapper;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
+import com.huiju.estateagents.redpack.entity.TaOrgAccount;
+import com.huiju.estateagents.redpack.entity.TaOrgAccountDetailedList;
+import com.huiju.estateagents.redpack.entity.TaOrgOrder;
+import com.huiju.estateagents.redpack.mapper.TaOrgAccountDetailedListMapper;
+import com.huiju.estateagents.redpack.mapper.TaOrgAccountMapper;
+import com.huiju.estateagents.redpack.mapper.TaOrgOrderMapper;
 import com.huiju.estateagents.service.ITaRaiseRecordService;
 import com.huiju.estateagents.service.IWxPayService;
 import lombok.extern.slf4j.Slf4j;
@@ -17,7 +23,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.xml.ws.soap.Addressing;
 import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
@@ -65,6 +70,15 @@ public class WxPayServiceImpl implements IWxPayService {
     @Autowired
     private TaContractMapper taContractMapper;
 
+    @Autowired
+    private TaOrgOrderMapper taOrgOrderMapper;
+
+    @Autowired
+    private TaOrgAccountDetailedListMapper taOrgAccountDetailedListMapper;
+
+    @Autowired
+    private TaOrgAccountMapper taOrgAccountMapper;
+
     /**
      * 微信支付-统一下单
      *
@@ -145,10 +159,44 @@ public class WxPayServiceImpl implements IWxPayService {
         //house类型的支付成功的回调,处理业务逻辑 修改订单状态等
         if (type.equals(CommConstant.ORDER_TARGET_TYPE_HOUSE)) {
             wxHouseNotify(resultMap);
+        }else if (type.equals(CommConstant.ITEM_TYPE_RECHARGE)){
+            //账户充值
+            accountRecharge(resultMap);
         }
 
     }
 
+    /**
+     * 账户充值
+     * @param resultMap
+     */
+    private void accountRecharge(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);
+        taOrgAccountDetailedListMapper.insert(taOrgAccountDetailedList);
+        //添加账户金额
+        taOrgAccount.setAvailableBalance(taOrgAccount.getAvailableBalance() + taOrgOrder.getAmount());
+        taOrgAccount.setPurchaseAmount(taOrgAccount.getPurchaseAmount() + taOrgOrder.getAmount());
+        taOrgAccountMapper.updateById(taOrgAccount);
+    }
+
     /**
      * 微信退款
      * @param taOrder

src/main/java/com/huiju/estateagents/third/service/impl/TaThirdPartyMiniappConfigServiceImpl.java

@@ -10,6 +10,7 @@ import com.github.binarywang.wxpay.service.WxPayService;
 import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.CommonUtils;
 import com.huiju.estateagents.common.MD5Utils;
 import com.huiju.estateagents.drainage.entity.TaDrainage;
 import com.huiju.estateagents.drainage.mapper.TaDrainageMapper;
@@ -357,12 +358,13 @@ public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPar
 		//获取收红包人的openid
 		TaMpPerson parentMpPerson = taMpPersonMapper.selectById(parentMpMiniapp.getMpPersonId());
 		//发送红包
+		String tradeNo = CommonUtils.generateTradeNo("HB");
 		WxPayService wxPayService = getWxPayService();
 		WxPaySendRedpackRequest build = WxPaySendRedpackRequest.newBuilder()
 //				.consumeMchId(wxPayService.getConfig().getMchId())
 				.actName(taRedPacketClient.getActivityName())//活动名称
 				.clientIp(String.valueOf(InetAddress.getLoopbackAddress()))//Ip地址
-				.mchBillNo("HB123456")//商户订单号
+				.mchBillNo(tradeNo)//商户订单号
 //				.msgAppid(mpAppid)
 				.remark(taRedPacketClient.getRemark())//备注
 				.reOpenid(parentMpPerson.getMpOpenid())//接受红包的用户openid
@@ -379,7 +381,7 @@ public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPar
 			String resultCode = wxPaySendRedpackResult.getResultCode();
 			if (resultCode.equals("SUCCESS")){
 				//插入订单表并扣钱反更新
-				saveRedpacketOrder("HB123456",wxPaySendRedpackResult,parentMpMiniapp,taRedPacketHelp,orgId,mpAppid);
+				saveRedpacketOrder(tradeNo,wxPaySendRedpackResult,parentMpMiniapp,taRedPacketHelp,orgId,mpAppid);
 			}else {
 				return;
 			}
@@ -392,6 +394,7 @@ public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPar
 		//先扣钱
 		TaOrgAccount taOrgAccount = taOrgAccountMapper.selectOne(new QueryWrapper<TaOrgAccount>().eq("org_id", orgId).eq("status", CommConstant.STATUS_NORMAL));
 		taOrgAccount.setRealBalance(taOrgAccount.getRealBalance() - wxPaySendRedpackResult.getTotalAmount());
+		taOrgAccount.setPurchaseAmount(taOrgAccount.getPurchaseAmount() + wxPaySendRedpackResult.getTotalAmount());
 		taOrgAccountMapper.updateById(taOrgAccount);
 		TaRedPacketMoney taRedPacketMoney = taRedPacketmonetMapper.selectById(taRedPacketHelp.getActivityId());
 		taRedPacketMoney.setBalance(taRedPacketMoney.getBalance()-wxPaySendRedpackResult.getTotalAmount());