Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-04-14 95f9ea7eb339c36cade6c67d0385c49ec2d81477

 zq-erp/src/main/java/com/matrix/component/wechat/externalInterface/weixinUtil/WeixinServiceUtil.java

@@ -25,6 +25,7 @@
import com.matrix.system.common.interceptor.HostInterceptor;
import com.matrix.system.shopXcx.api.tools.WxShopOrderUtil;
import org.apache.log4j.Logger;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -70,6 +71,24 @@
    * @throws Exception
    */
   public BrandWCPayRequestData createOrder(String desc,String outTradeNo, int price, String openId,String attach) throws Exception {
      Long companyId=HostInterceptor.getCompanyId();
      BusParameterSettings notifyUrl = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.WECHARPAY_NOTIFYURL, companyId);
      return buildBrandWCPayRequestData(desc, outTradeNo, price, openId, attach, notifyUrl);
   }

   /**
    * 创建充值订单
    */
   public BrandWCPayRequestData createRechargeOrder(String desc, String outTradeNo, int price, String openId, String attach) throws Exception {
      Long companyId=HostInterceptor.getCompanyId();
      BusParameterSettings notifyUrl = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.WECHARPAY_RECHARGE_NOTIFYURL, companyId);
      return buildBrandWCPayRequestData(desc, outTradeNo, price, openId, attach, notifyUrl);
   }



   @NotNull
   private BrandWCPayRequestData buildBrandWCPayRequestData(String desc, String outTradeNo, int price, String openId, String attach, BusParameterSettings notifyUrl) throws Exception {
      // 创建微信支付预付接口
      JsApiPayBusiness jsApiPayBusiness = new JsApiPayBusiness();
      String idAddr = getIpAddr(WebUtil.getRequest());
@@ -78,7 +97,7 @@

      BusParameterSettings mchID = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.WECHARPAY_MCHID, companyId);
      BusParameterSettings paySecret = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.WECHARPAY_SECRET, companyId);
      BusParameterSettings notifyUrl = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.WECHARPAY_NOTIFYURL, companyId);


      BusParameterSettings appId = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.MINIPROGRAM_APPID, companyId);

@@ -102,7 +121,6 @@
         LogUtil.error("创建微信支付订单失败msg={}",result.getReturn_msg());
         throw new GlobleException("创建微信支付订单失败，请检查程序配置");
      }

   }
   
   
@@ -142,20 +160,31 @@
    * @param openid
    * @return
    */
   public JsApiPayComResData comPay(String desc, String outTradeNo,int totalFee, String openid){
   public JsApiPayComResData comPay(String desc, String outTradeNo,int totalFee, String openid,Long companyId){
      JsApiPayComResData result=null;
      //boolean flag=false;
      try {
         JsApiPayBusiness jsApiPayBusiness = new JsApiPayBusiness();
         // TODO 企业付款
         Long companyId=HostInterceptor.getCompanyId();

         BusParameterSettings mchID = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.WECHARPAY_MCHID, companyId);
         BusParameterSettings appId = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.MINIPROGRAM_APPID, companyId);
         BusParameterSettings paySecret = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.WECHARPAY_SECRET, companyId);

         BusParameterSettings certLocalPath = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.WECHARPAY_CERTLOCAL_PATH, companyId);

         JsApiPayComReqData jsApiPayComReqData=new JsApiPayComReqData(mchID.getParamValue(),paySecret.getParamValue(),"","",0,"","","");
         JsApiPayComReqData jsApiPayComReqData=new JsApiPayComReqData(mchID.getParamValue(),
               appId.getParamValue(),
               paySecret.getParamValue(),
               desc,outTradeNo,totalFee,openid,"NO_CHECK","");
         JsApiPayComService jsApiPayComService=new JsApiPayComService();

         HttpsRequest2 request2= (HttpsRequest2) jsApiPayComService.getServiceRequest();
         request2.setCertLocalPath(certLocalPath.getParamValue());
         request2.setMchId(mchID.getParamValue());


         result = jsApiPayBusiness.payComOrder(jsApiPayComService, jsApiPayComReqData);

         LogUtil.info("#提现，企业付款到个人---result:{}",result);
         if (result.getResult_code().equals("SUCCESS")) {
            return result;