xiugai

YijiaRestful/src/main/java/com/platform/yijia/controller/ElectronicMembershipCardController.java

@@ -10,6 +10,10 @@ import com.platform.yijia.pojo.*;
 import com.platform.yijia.service.*;
 import com.platform.yijia.utils.*;
 import com.platform.yijia.utils.weixinapp.WxPushUtil;
+import com.saobei.open.sdk.DefaultSaobeiApiClient;
+import com.saobei.open.sdk.SaobeiApiClient;
+import com.saobei.open.sdk.model.requst.trade.SaobeiJsPayRequest;
+import com.saobei.open.sdk.model.response.trade.SaobeiJsPayResponse;
 import me.chanjar.weixin.mp.bean.template.WxMpTemplateData;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -1041,6 +1045,249 @@ public class ElectronicMembershipCardController {
         return gson.toJson(resultData);
     }
 
+
+    //新修订支付通道：传参payChannelType 来区分使用随行付还是云闪付     用户充值电子会员卡（储蓄卡）拉起支付接口
+    @RequestMapping(value = "/rechargeBalanceChannelFPay", method = RequestMethod.POST)
+    @ResponseBody
+    public String rechargeBalanceChannelFPay(@RequestBody RechargeBalance rechargeBalance) throws Exception {
+        Gson gson =new Gson();
+        //返回结果集
+        ResultData resultData = null;
+        if(rechargeBalance !=null && StringUtils.isNotBlank(rechargeBalance.getAmt()) && StringUtils.isNotBlank(rechargeBalance.getOpenId())
+                && StringUtils.isNotBlank(rechargeBalance.getUserType()) && rechargeBalance.getStationId() !=null && StringUtils.isNotBlank(rechargeBalance.getOrderNo())){
+            String amt = rechargeBalance.getAmt();
+            String openId = rechargeBalance.getOpenId();    //公众号的openId
+            Integer stationId = rechargeBalance.getStationId();
+            String userType = rechargeBalance.getUserType();
+            String orderNo = rechargeBalance.getOrderNo();
+
+            CustomerCardUseRecord customerCardUseRecord = new CustomerCardUseRecord();
+            customerCardUseRecord.setOrderNo(orderNo);
+            CustomerCardUseRecord cardRecordByOrderNo = electronicMembershipCardService.getCardRecordByOrderNo(customerCardUseRecord);
+            if(cardRecordByOrderNo !=null ){
+                if(cardRecordByOrderNo.getStatus() !=null && cardRecordByOrderNo.getStatus().equals("0")){
+                    if(rechargeBalance.getPayChannelType() !=null && rechargeBalance.getPayChannelType().equals("2")){
+                        /******************************************************云闪付支付***********************************************************/
+                        Map<String, String> staPayChannelInfo = stationService.getStationAppIdAndAppSecret(stationId);
+                        if(staPayChannelInfo !=null && staPayChannelInfo.containsKey("merchantNo") && staPayChannelInfo.containsKey("terminalId")
+                                && staPayChannelInfo.containsKey("yunKey") && staPayChannelInfo.containsKey("gzhAppId")){
+                            logger.info("==============================云闪付 公众号电子卡充值 拉起支付 ** 开始 **============================================");
+                            //创建client
+                            SaobeiApiClient<SaobeiJsPayRequest, SaobeiJsPayResponse> client = new DefaultSaobeiApiClient<>(staPayChannelInfo.get("yunKey"));
+                            //创建requst
+                            SaobeiJsPayRequest requst = new SaobeiJsPayRequest();
+                            requst.setPay_ver("110");
+                            requst.setPay_type("010");
+                            requst.setService_id("012");
+                            requst.setMerchant_no(staPayChannelInfo.get("merchantNo"));                 //商户号
+                            requst.setTerminal_id(staPayChannelInfo.get("terminalId"));                 //终端号
+                            requst.setTerminal_trace(cardRecordByOrderNo.getOrderNo());                 //订单号
+                            requst.setTerminal_time(new SimpleDateFormat("yyyyMMddhhmmss").format(new Date()));
+
+                            BigDecimal totalFee = new BigDecimal(cardRecordByOrderNo.getAmt().toString()).multiply(new BigDecimal("100")).setScale(0, BigDecimal.ROUND_DOWN);
+                            logger.info("该订单金额：" + cardRecordByOrderNo.getAmt().toString()+"; 拉起云闪付上送金额（单位：分)：" + totalFee.toString());
+                            requst.setTotal_fee(totalFee.toString());
+                            requst.setSub_appid(staPayChannelInfo.get("gzhAppId"));
+                            requst.setOpen_id(openId);                      //oJR5R6r4EJhaORFcPap70r_mtFZo   //oRwjv4iHjSUgxNxOJOQ_60Ln7cno
+
+                            Oil oil = new Oil();
+                            oil.setOilsType(cardRecordByOrderNo.getCardOilsType());
+                            if(cardRecordByOrderNo.getCardOilsType().equals("1") || cardRecordByOrderNo.getCardOilsType().equals("2")){
+                                oil.setDictType("oil");
+                            }else {
+                                oil.setDictType("oil_name");
+                            }
+                            String cardName =sysDictDataService.selectOilType(oil).getOilName();
+                            String orderBody = cardName+ "电子卡" + " - " +cardRecordByOrderNo.getStationName();
+                            requst.setOrder_body(orderBody);
+                            String notifyUrl = "https://" + this.domainName + "/" + this.globalPrefix + "/getYunPayGzhCallback";
+                            logger.info("回调地址："+ notifyUrl);
+                            requst.setNotify_url(notifyUrl);
+                            //发送请求
+                            System.out.println("请求报文:"+JSON.toJSONString(requst));
+                            SaobeiJsPayResponse response = client.execute(requst);
+                            System.out.println("返回报文:"+JSON.toJSONString(response));
+
+                            //返回前端字段
+                            Map<String, Object> reqData = new HashMap<>();
+                            //Map<String, Object> resultMap = new HashMap<>();
+                            if(response !=null && response.getResult_code().equals("01")){
+                                reqData.put("timeStamp", response.getTimeStamp());
+                                reqData.put("payPackage", response.getPackage_str());
+                                reqData.put("signType", response.getSignType());
+                                reqData.put("paySign", response.getPaySign());
+                                reqData.put("return_msg", response.getReturn_msg());
+                                reqData.put("merchant_name", response.getMerchant_name());
+                                reqData.put("total_fee", response.getTotal_fee());
+                                reqData.put("terminal_time", response.getTerminal_time());
+                                reqData.put("terminal_trace", response.getTerminal_trace());
+                                reqData.put("code", response.getResult_code());
+                            }else if(response !=null && response.getResult_code().equals("02")){
+                                reqData.put("code", response.getResult_code());
+                                reqData.put("return_msg", response.getReturn_msg());
+                            }else {
+                                //自己定义
+                                reqData.put("code", "03");
+                                reqData.put("return_msg", "当前支付系统参数配置错误请检查！");
+                            }
+
+                            logger.info("云闪付返回给前端字段：" + JSON.toJSONString(reqData));
+                            resultData = ResultData.success(reqData);
+
+                            logger.info("==============================云闪付 公众号电子卡 充值 拉起支付 ** 结束 **============================================");
+                        }else {
+                            resultData = ResultData.error(CodeMsg.STATION_NULL_INFO);
+                        }
+                    }else {
+                        /******************************************************随行付支付****************************************************************************/
+                        //将业务参数存放在 JSON 对象中
+                        JSONObject reqData = new JSONObject();
+                        Map<String, String> resultMap = stationService.getStationAppIdAndAppSecret(stationId);
+                        if(resultMap !=null && resultMap.containsKey("gzhAppId") && resultMap.containsKey("mno")){
+                            logger.info("=================================电子会员卡（储蓄卡）充值功能调用随行付接口================================");
+                            try {
+                                if(userType.equals("1")){
+                                    //1 是微信
+                                    reqData.put("payType", "WECHAT"); //支付渠道 WECHAT：微信；ALIPAY:支付宝；UNIONPAY:银联
+                                    reqData.put("payWay", "02"); //支付方式  02 公众号/服 务窗/js支付 03 小程序
+                                    reqData.put("userId", openId); //用户号 微信：openid； 支付宝：userid；银联：userid；微信&支付宝必传，银联js为非必传
+                                    reqData.put("subAppid", resultMap.get("gzhAppId")); //微信公众号
+                                    logger.info("支付子商户："+ resultMap.get("gzhAppId"));
+                                }else if(userType.equals("2")){
+                                    //2 支付宝
+                                    reqData.put("payType", "ALIPAY"); //支付渠道 WECHAT：微信；ALIPAY:支付宝；UNIONPAY:银联
+                                    reqData.put("payWay", "02"); //支付方式  02 公众号/服 务窗/js支付 03 小程序
+                                    reqData.put("userId", openId); //用户号 微信：openid； 支付宝：userid；银联：userid；微信&支付宝必传，银联js为非必传
+                                    reqData.put("subAppid", resultMap.get("aliAppId")); //支付宝服务号appid
+                                    logger.info("支付子商户："+ resultMap.get("aliAppId"));
+                                }
+                                reqData.put("mno", resultMap.get("mno")); //商户编号
+                                logger.info("商户编号："+ resultMap.get("mno"));
+                                reqData.put("ordNo", orderNo); //商户订单号
+                                reqData.put("amt", amt); //订单总金额
+                                Oil oil = new Oil();
+                                oil.setOilsType(cardRecordByOrderNo.getCardOilsType());
+                                if(cardRecordByOrderNo.getCardOilsType().equals("1") || cardRecordByOrderNo.getCardOilsType().equals("2")){
+                                    oil.setDictType("oil");
+                                }else {
+                                    oil.setDictType("oil_name");
+                                }
+                                String cardName =sysDictDataService.selectOilType(oil).getOilName();
+                                reqData.put("subject", cardName+ "电子卡" + " - " +cardRecordByOrderNo.getStationName()); //订单标题
+                                reqData.put("tradeSource", "01"); //交易来源 01服务商，02收银台，03硬件
+                                reqData.put("trmIp", "172.16.2.1");//商家ip地址
+                                reqData.put("outFrontFailUrl", ""); //js 支付，前台 事变通知地址
+                                String notifyUrl = "https://"+domainName+"/"+globalPrefix+"/getCardRechargeCallback";
+                                reqData.put("notifyUrl", notifyUrl); //回调地址
+//                            reqData.put("notifyUrl", "https://www.huijy.net/api/getCardRechargeCallback"); //回调地址
+//                            reqData.put("subMechId", ""); //子商户号
+//                            reqData.put("amt", "0.01");
+//                            reqData.put("discountAmt", ""); //参与优惠金额
+//                            reqData.put("unDiscountAmt", ""); //不参与优惠金额
+//                            reqData.put("timeExpire", "10"); //订单失效时间, 以分钟为单位
+//                            reqData.put("limitPay", "00"); //限制卡类型: 00-全部 01-限定不能使 用信用卡支付 默认值 00
+//                            reqData.put("hbFqNum", "6"); //花呗分期数,仅可上送 6 或 12
+//                            reqData.put("customerIp", ""); //持卡人ip地址，银联js支付时必传
+//                            reqData.put("outFrontUrl", ""); //js 支付，前台 成功通知地址
+//                            reqData.put("needReceipt", "00"); //电子发票功能 微信开具电子 发票使用
+//                            reqData.put("ledgerAccountFlag", "00"); //是否做分账 分账交易使 用；00：做； 01：不做；不传默认为不做分账
+//                            reqData.put("ledgerAccountEffectTime", "00"); //分账有效时间 单位为天；是 否做分账选择 00 时该字段必传
+//                            reqData.put("ruleId", "00"); //同 步 分 账 规 则 id
+//                            reqData.put("fusruleId", "00"); //同步分账规则
+//                            reqData.put("ylTrmNo", ""); //银联终端号
+//                            reqData.put("terminalId", ""); //TQ机具编号
+//                            reqData.put("deviceNo ", "1111"); //设备号
+//                            reqData.put("identityFlag", ""); //是否是实名支付
+//                            reqData.put("buyerIdType", "IDCARD"); //证件类型
+//                            reqData.put("buyerIdNo", "410523198701054018"); //证件号
+//                            reqData.put("buyerName", "张三"); //买家姓名
+//                            reqData.put("mobileNum", ""); //手机号
+//                            reqData.put("extend", ""); //备用
+                                String req= SXFPaySign.getSXFPay(reqData);
+                                logger.debug("参数信息："+req);
+                                System.out.println("req:" + req);
+                                //此处不要改变reqData里面值的顺序用LinkedHashMap
+                                HashMap reqMap = JSON.parseObject(req, LinkedHashMap.class, Feature.OrderedField);
+                                //组装加密串
+                                String signContent = RSASignature.getOrderContent(reqMap);
+                                System.out.println("拼接后的参数：" + signContent);
+                                logger.debug("拼接后的参数："+signContent);
+                                //sign
+                                String sign = RSASignature.encryptBASE64(RSASignature.sign(signContent, SXFPaySign.privateKey));
+                                System.out.println("============签名:" + sign);
+                                reqMap.put("sign", sign);
+                                String reqStr = JSON.toJSONString(reqMap);
+                                System.out.println("请求参数:" + reqMap);
+                                System.out.println("请求参数:" + reqStr);
+                                //调用第三方接口地址
+                                //String url = "https://openapi-test.tianquetech.com/order/jsapiScan";//测试地址
+                                String url = "https://openapi.suixingpay.com/order/jsapiScan";//生产地址
+                                String resultJson = HttpUtils.connectPostUrl(url, reqStr);
+                                System.out.println("返回信息：" + resultJson);
+                                //   logger.debug("返回信息："+resultJson);
+                                //不要对reqData排序 所以用LinkedHashMap
+                                HashMap<String, Object> result = JSON.parseObject(resultJson, LinkedHashMap.class, Feature.OrderedField);
+
+                                Map<String, Object> r = new HashMap<>(); //返回前端参数
+                                if ("0000".equals(result.get("code"))) {
+                                    //验签
+                                    String signResult = result.get("sign").toString();
+                                    result.remove("sign");
+                                    String resultStr = RSASignature.getOrderContent(result);
+                                    System.out.println(resultStr);
+                                    //sign
+                                    String resultSign = RSASignature.encryptBASE64(RSASignature.sign(signContent, SXFPaySign.privateKey));
+                                    System.out.println("resultSign:" + resultSign);
+                                    //组装加密串
+                                    if (RSASignature.doCheck(resultStr, signResult, SXFPaySign.sxfPublic)) {
+                                        System.out.println("===================验签成功==============");
+                                        logger.info("随行付返回字段：" +result);
+                                        r.put("code", result.get("code"));
+                                        r.put("msg", result.get("msg"));
+                                        //net.sf.json.JSONObject result = location.getJSONObject("result").getJSONObject("addressComponent");
+                                        JSONObject respData = (JSONObject)result.get("respData");
+                                        r.put("payTimeStamp", respData.get("payTimeStamp"));
+                                        r.put("ordNo", respData.get("ordNo"));
+                                        r.put("payPackage", respData.get("payPackage"));
+                                        r.put("bizMsg", respData.get("bizMsg"));
+                                        r.put("paySign", respData.get("paySign"));
+                                        r.put("bizCode", respData.get("bizCode"));
+                                        r.put("payAppId", respData.get("payAppId"));
+                                        r.put("sxfUuid", respData.get("sxfUuid"));
+                                        r.put("paynonceStr", respData.get("paynonceStr"));
+                                        r.put("paySignType", respData.get("paySignType"));
+                                        r.put("uuid", respData.get("uuid"));
+
+                                        r.put("orgId", result.get("orgId"));
+                                        r.put("signType", result.get("signType"));
+                                        r.put("reqId", result.get("reqId"));
+                                    }
+                                }else {
+                                    r.put("code", result.get("code"));
+                                    r.put("msg", result.get("msg"));
+                                }
+                                logger.info("随行付支付时系统返回前端参数字段：" +r);
+                                resultData=ResultData.success(r);
+                            }catch (Exception e){
+                                resultData=ResultData.error(CodeMsg.YEWU_FAIL,"订单支付失败");
+                                e.printStackTrace();
+                            }
+                        }else {
+                            resultData = ResultData.error(CodeMsg.STATION_NULL_INFO);
+                        }
+                    }
+                }else {
+                    resultData = ResultData.error(CodeMsg.ALREADY_PAY);
+                }
+            }else {
+                resultData=ResultData.error(CodeMsg.YEWU_FAIL,"未查询到订单");
+            }
+        }else {
+            resultData = ResultData.error(CodeMsg.REQUEST_FAIL);
+        }
+        return gson.toJson(resultData);
+    }
+
     //用户电子会员卡（储蓄卡）充值功能随行付回调功能
     @RequestMapping(value = "/getCardRechargeCallback", consumes = "application/json", method = RequestMethod.POST)
     @ResponseBody

YijiaRestful/src/main/java/com/platform/yijia/controller/PayController.java

@@ -300,7 +300,7 @@ public class PayController {
     }
 
     /**
-     * 支付接口，前台上传支付信息，支付数据落地生产订单，调用随行付支付接口
+     * 新修订支付通道：传参payChannelType 来区分使用随行付还是云闪付     用户充值电子会员卡（储蓄卡）拉起支付接口
      * @param
      * @return
      */
@@ -336,6 +336,7 @@ public class PayController {
                 if(payOrder!=null ){
                     if(payOrder.getStatus() !=null && payOrder.getStatus().equals("0")){
                         if(payInfoRequest.getPayChannelType() !=null && payInfoRequest.getPayChannelType().equals("2")){
+                            /******************************************************云闪付支付***********************************************************/
                             //云闪付支付方式
                             Map<String, String> staPayChannelInfo = stationService.getStationAppIdAndAppSecret(Integer.valueOf(payInfoRequest.getStationId()));
                             if(staPayChannelInfo !=null && staPayChannelInfo.containsKey("merchantNo") && staPayChannelInfo.containsKey("terminalId")
@@ -402,6 +403,7 @@ public class PayController {
                                 resultData = ResultData.error(CodeMsg.STATION_NULL_INFO);
                             }
                         }else{
+                            /******************************************************随行付支付***********************************************************/
                             //将业务参数存放在 JSON 对象中
                             JSONObject reqData = new JSONObject();
                             reqData.put("ordNo", payOrder.getOrderNo()); //商户订单号