支付宝支付

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

@@ -77,12 +77,12 @@ public class AppUserInfoController {
     //获取支付宝用户信息
     @ResponseBody
     @RequestMapping(value = "/getAliUserInfo")
-    public String getAliUserInfo(@RequestParam String code){
+    public String getAliUserInfo(@RequestParam String authCode){
         Gson gson =new Gson();
         //返回结果集
         ResultData resultData = null;
-        logger.info("获取用户信息所需code："+code);
-        if(StringUtils.isNotBlank(code)){
+        logger.info("获取用户信息所需code："+authCode);
+        if(StringUtils.isNotBlank(authCode)){
             try {
                 AlipayClient alipayClient = new DefaultAlipayClient(
                         "https://openapi.alipay.com/gateway.do",
@@ -94,7 +94,7 @@ public class AppUserInfoController {
                         "RSA2");
                 AlipaySystemOauthTokenRequest alipaySystemOauthTokenRequest = new AlipaySystemOauthTokenRequest();
                 alipaySystemOauthTokenRequest.setGrantType("authorization_code");
-                alipaySystemOauthTokenRequest.setCode(code);
+                alipaySystemOauthTokenRequest.setCode(authCode);
                 AlipaySystemOauthTokenResponse alipaySystemOauthTokenResponse = alipayClient.execute(alipaySystemOauthTokenRequest);
                 if (alipaySystemOauthTokenResponse.isSuccess()){
                     logger.info("支付宝小程序获取access_token："+ alipaySystemOauthTokenResponse.getAccessToken());
@@ -122,10 +122,11 @@ public class AppUserInfoController {
         Gson gson =new Gson();
         //返回结果集
         ResultData resultData = null;
-        if(StringUtils.isNotBlank(jsonObject.get("encryptedData").toString())){
+        logger.info("前端解密手机号传递参数信息：" + jsonObject.toString());
+        if(StringUtils.isNotBlank(jsonObject.get("response").toString())){
             try {
                 //解密用户手机号数据
-                String encryptedData = jsonObject.get("encryptedData").toString();
+                String encryptedData = jsonObject.get("response").toString();
                 logger.info("支付宝获取手机号要解密数据: " +encryptedData);
                 String aes = AlipayEncrypt.decryptContent(encryptedData, "AES", ENCRYPT_KEY, "UTF-8");
                 logger.info("支付宝获取手机号解密后的数据：" +aes);

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

@@ -295,7 +295,7 @@ public class PayController {
                         }else if(userType.equals("2")){
                             //2 是支付宝
                             reqData.put("payType", "ALIPAY"); //支付渠道 WECHAT：微信；ALIPAY:支付宝；UNIONPAY:银联
-                            reqData.put("payWay", "03"); //支付方式  02 公众号/服 务窗/js支付 03 小程序
+                            reqData.put("payWay", "02"); //支付方式  02 公众号/服 务窗/js支付 03 小程序
                             reqData.put("userId", appUserInfos.getALiId()); //用户号 微信：openid； 支付宝：userid；银联：userid；微信&支付宝必传，银联js为非必传
                         }
                         //reqData.put("timeExpire", "10"); //订单失效时间, 以分钟为单位
@@ -2187,15 +2187,385 @@ public class PayController {
 
 
     //支付宝扫码随行付支付
-    @RequestMapping(value = "/aliPayAmt", consumes = "application/json", method = RequestMethod.POST)
+    @RequestMapping(value = "/aliPayAmtToSxf", consumes = "application/json", method = RequestMethod.POST)
     @ResponseBody
-    public String aliPayAmt(@RequestBody PayOrder payOrder){
+    public String aliPayAmtToSxf(@RequestBody PayInfoRequest payInfoRequest){
         Gson gson =new Gson();
         //返回结果集
         ResultData resultData = null;
+        if(StringUtils.isNotBlank(payInfoRequest.getOpenId())  && StringUtils.isNotBlank(payInfoRequest.getOrdNo())){
+            String openId = payInfoRequest.getOpenId(); //用户openId
+            String ordNo = payInfoRequest.getOrdNo();
+            try {
+                //根据订单号查询订单信息
+                PayOrder payOrder = payOrderService.selectOrderInfoByOrdNo(ordNo);
+                if(payOrder !=null){
+                    if(payOrder.getStatus() !=null && payOrder.getStatus().equals("0")){
+                        //将业务参数存放在 JSON 对象中
+                        JSONObject reqData = new JSONObject();
+                        reqData.put("ordNo", payOrder.getOrderNo()); //商户订单号
+                        //reqData.put("subMechId", ""); //子商户号
+                        reqData.put("amt", payOrder.getAmt()); //订单总金额
+                        //reqData.put("amt", "0.01");
+                        //reqData.put("discountAmt", ""); //参与优惠金额
+                        //reqData.put("unDiscountAmt", ""); //不参与优惠金额
+                        Map<String, String> stationAppIdAndAppSecret = stationService.getStationAppIdAndAppSecret(Integer.valueOf(payInfoRequest.getStationId()));
+                        if(stationAppIdAndAppSecret !=null && stationAppIdAndAppSecret.containsKey("appId") && stationAppIdAndAppSecret.containsKey("mno")){
+                            //reqData.put("subAppid", stationAppIdAndAppSecret.get("appId")); //支付宝小程序
+                            //logger.info("支付子商户："+ stationAppIdAndAppSecret.get("appId"));
+                            reqData.put("mno", stationAppIdAndAppSecret.get("mno")); //商户编号 stationAppIdAndAppSecret.get("mno")
+                            logger.info("商户编号："+ stationAppIdAndAppSecret.get("mno"));
+                            reqData.put("payType", "ALIPAY"); //支付渠道 WECHAT：微信；ALIPAY:支付宝；UNIONPAY:银联
+                            reqData.put("payWay", "02"); //支付方式  02 微信公众号/支付宝服务窗/银联js支付/支付宝小程序 03 微信小程序
+                            reqData.put("userId", openId); //用户号 微信：openid； 支付宝：userid；银联：userid；微信&支付宝必传，银联js为非必传
+                            //reqData.put("timeExpire", "10"); //订单失效时间, 以分钟为单位
+                            //reqData.put("limitPay", "00"); //限制卡类型: 00-全部 01-限定不能使 用信用卡支付 默认值 00
+
+                            reqData.put("subject", payOrder.getOilName() + " - " +payOrder.getStationName()); //订单标题
+                            //reqData.put("hbFqNum", "6"); //花呗分期数,仅可上送 6 或 12
+                            reqData.put("tradeSource", "01"); //交易来源 01服务商，02收银台，03硬件
+                            reqData.put("trmIp", "172.16.2.1");//商家ip地址
+                            // reqData.put("customerIp", ""); //持卡人ip地址，银联js支付时必传
+
+                            //reqData.put("outFrontUrl", ""); //js 支付，前台 成功通知地址
+                            reqData.put("outFrontFailUrl", ""); //js 支付，前台 事变通知地址
+                            //globalPrefix
+                            String notifyUrl = "https://"+domainName+"/"+globalPrefix+"/getAliPayCallback";
+                            logger.info("随行付调用回调地址：" + notifyUrl);
+                            //reqData.put("notifyUrl", "https://www.huijy.net/api/getCallback"); //回调地址
+                            reqData.put("notifyUrl", notifyUrl); //回调地址
+                            //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);
+                            if ("0000".equals(result.get("code"))) {
+                                //验签
+                                String signResult = result.get("sign").toString();
+                                result.remove("sign");
+                                String resultStr = RSASignature.getOrderContent(result);
+                                System.out.println("resultStr: " + 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("===================验签成功==============");
+                                }
+                            }
+                            resultData=ResultData.success(result);
+                        }else {
+                            resultData = ResultData.error(CodeMsg.STATION_NULL_INFO);
+                        }
+                    }else {
+                        resultData=ResultData.error(CodeMsg.ALREADY_PAY);
+                    }
+                }else {
+                    resultData=ResultData.error(CodeMsg.YEWU_FAIL,"未查询到订单");
+                }
+            }catch (Exception e){
+                resultData=ResultData.error(CodeMsg.YEWU_FAIL,"订单支付失败");
+                e.printStackTrace();
+            }
+        }else {
+            resultData = ResultData.error(CodeMsg.PARAMS_NUll);
+        }
+
         return gson.toJson(resultData);
     }
 
+    /**
+     * 异步回调通知
+     */
+    @RequestMapping(value = "/getAliPayCallback", consumes = "application/json", method = RequestMethod.POST)
+    @ResponseBody
+    @Transactional
+    public JSONObject getAliPayCallback(@RequestBody JSONObject request) throws ParseException {
+        logger.info("-------------------------------支付宝回调开始----------------------------------------------");
+        logger.info("支付宝回调返回过来的参数"+request);
+//        logger.info("ordNo信息：" + request.get("ordNo").toString());
+//        logger.info("sign信息：" + request.get("sign").toString());
+        Gson gson =new Gson();
+
+
+        String sxfUuid=request.get("sxfUuid").toString();     //随行付落单号
+        String payWay=request.get("payWay").toString();     //随行付交易方式
+        String payTime=request.get("payTime").toString();   //随行付交易时间
+        String uuid=request.get("uuid").toString();         //随行付交易流水号
+        String mno=request.get("mno").toString();//发起交易的商户编号
+        String ordNo=request.get("ordNo").toString();//商户生成的订单号
+        String amt=request.get("amt").toString();//金额
+        String buyerId=request.get("buyerId").toString();//用户登录
+        String transactionId=request.get("transactionId").toString();
+        String drType=request.get("drType").toString();//借贷记标识 1-借,2-贷，3-其他
+        String payType=request.get("payType").toString();//对订单的描述，取值范围：WECHAT:微信,ALIPAY:支付宝,UNIONPAY:
+
+        String pointAmount=request.get("pointAmount").toString();//代金券金额
+        String totalOffstAmt=request.get("totalOffstAmt").toString();//消 费 者 付 款金额
+        String settleAmt=request.get("settleAmt").toString();//商家入账金额
+        String timeStamp=request.get("timeStamp").toString();//响应时间
+        String sign=request.get("sign").toString();//签名
+        String bizCode=request.get("bizCode").toString();//业务返回码
+        String bizMsg=request.get("bizMsg").toString();//业 务 返 回 信息
+        String openid=request.get("openid").toString();//微 信 或 支 付宝身份id()opendid userid
+        String channelId=request.get("channelId").toString();//渠道商户号
+        String subMechId=request.get("subMechId").toString();//子商户号
+        String finishTime=request.get("finishTime").toString();//交易完成时间
+        String clearDt=request.get("clearDt").toString();
+        String settlementBatchNo=request.get("settlementBatchNo").toString();
+
+        //String origOrdNo=request.get("origOrdNo").toString();//反交易退款异步通知
+        //String origUuid=request.get("origUuid").toString();//token
+        //String scene=request.get("scene").toString();//用户登录
+        //String buyerAccount=request.get("buyerAccount").toString();//
+        //String realRefundAmount=request.get("realRefundAmount").toString();//商家出账金额
+        //String recFeeAmt=request.get("recFeeAmt").toString();//交易手续费
+        //String recFeeRate=request.get("recFeeRate").toString();//交易手续费率
+        //String refBuyerAmt=request.get("refBuyerAmt").toString();//消 费 者 到 账金额
+        //String extend = extend=request.get("extend").toString();//备用
+
+
+        //将业务参数存放在 JSON 对象中
+        JSONObject reqData = new JSONObject();
+
+        if(request.containsKey("payBank") && request.get("payBank") !=null){
+            String payBank=request.get("payBank").toString();//付款银行银行编码，例如 ICBC
+            reqData.put("payBank", payBank);
+        }
+
+        //支付场景
+        if(request.containsKey("scene") && request.get("scene") !=null){
+            String scene = request.get("scene").toString();
+            reqData.put("scene", scene);
+        }
+
+        //消 费 者 到 账金额
+        if(request.containsKey("refBuyerAmt") && request.get("refBuyerAmt") !=null){
+            String refBuyerAmt = request.get("refBuyerAmt").toString();
+            reqData.put("refBuyerAmt", refBuyerAmt);
+        }
+
+        //buyerAccount 支付宝买家登录账号  掩码；示例：135***1234
+        if(request.containsKey("buyerAccount") && request.get("buyerAccount") !=null){
+            String buyerAccount = request.get("buyerAccount").toString();
+            reqData.put("buyerAccount", buyerAccount);
+        }
+
+        //备用
+        if(request.containsKey("extend") && request.get("extend") !=null){
+            String extend = request.get("extend").toString();
+            reqData.put("extend", extend);
+        }
+
+        //优惠券参数
+        if(request.containsKey("promotionDetail") && request.get("promotionDetail") !=null){
+            String promotionDetail = request.get("promotionDetail").toString();
+            reqData.put("promotionDetail", promotionDetail);
+        }
+        //商家出账金额
+        if(request.containsKey("realRefundAmount") && request.get("realRefundAmount") !=null){
+            String realRefundAmount = request.get("realRefundAmount").toString();
+            reqData.put("realRefundAmount", realRefundAmount);
+        }
+        //szltFlag
+        if(request.containsKey("szltFlag") && request.get("szltFlag") !=null){
+            String szltFlag = request.get("szltFlag").toString();
+            reqData.put("szltFlag", szltFlag);
+        }
+        //recFeeAmt
+        if(request.containsKey("recFeeAmt") && request.get("recFeeAmt") !=null){
+            String recFeeAmt = request.get("recFeeAmt").toString();
+            reqData.put("recFeeAmt", recFeeAmt);
+        }
+        //szltRecfeeAmt
+        if(request.containsKey("szltRecfeeAmt") && request.get("szltRecfeeAmt") !=null){
+            String szltRecfeeAmt = request.get("szltRecfeeAmt").toString();
+            reqData.put("szltRecfeeAmt", szltRecfeeAmt);
+        }
+
+        reqData.put("sxfUuid",sxfUuid);
+        reqData.put("payWay",payWay);
+        reqData.put("payTime",payTime);
+        reqData.put("uuid",uuid);
+        reqData.put("mno",mno);
+        reqData.put("ordNo",ordNo);
+        reqData.put("amt",amt);
+        reqData.put("buyerId",buyerId);
+        reqData.put("transactionId",transactionId);
+        reqData.put("drType",drType);
+        reqData.put("payType",payType);
+        //reqData.put("payBank",payBank);
+        reqData.put("pointAmount",pointAmount);
+        reqData.put("totalOffstAmt",totalOffstAmt);
+        reqData.put("settleAmt",settleAmt);
+        reqData.put("timeStamp",timeStamp);
+        reqData.put("bizCode",bizCode);
+        reqData.put("bizMsg",bizMsg);
+        reqData.put("openid",openid);
+        reqData.put("channelId",channelId);
+        reqData.put("subMechId",subMechId);
+        reqData.put("finishTime",finishTime);
+        reqData.put("clearDt",clearDt);
+        reqData.put("settlementBatchNo",settlementBatchNo);
+
+        //reqData.put("realRefundAmount",realRefundAmount);
+        //reqData.put("recFeeAmt",recFeeAmt);
+        //reqData.put("recFeeRate",recFeeRate);
+        //reqData.put("buyerAccount",buyerAccount);
+        //reqData.put("origOrdNo",origOrdNo);
+        //reqData.put("origUuid",origUuid);
+        //reqData.put("scene",scene);
+        //reqData.put("refBuyerAmt",refBuyerAmt);
+        //reqData.put("extend",extend);
+        //根据回调信息，先进行验签，验签后修改状态
+        logger.info("打印参数信息"+gson.toJson(reqData));
+        //不要对reqData排序 所以用LinkedHashMap
+        HashMap<String, Object> result = JSON.parseObject(gson.toJson(reqData), LinkedHashMap.class, Feature.OrderedField);
+        //验签
+        String resultStr = RSASignature.getOrderContent(result);
+        JSONObject req = new JSONObject();
+        System.out.println(resultStr);
+        if (RSASignature.doCheck(resultStr, sign, SXFPaySign.sxfPublic)) {
+            req.put("code","success");
+            req.put("msg","成功");
+            logger.info("验签成功");
+            //验签成功，修改订单状态
+            List<PayOrder> list = payOrderService.getPayOrderList(ordNo);
+            //logger.info("根据订单号，查询订单"+gson.toJson(list));
+            if (list != null && list.size() == 1) {
+                String status = list.get(0).getStatus();
+                //状态为未支付 0  修改状态为1已支付
+                if (status.equals("0")) {
+                    PayOrder payOrder = new PayOrder();
+                    payOrder.setOrderNo(ordNo);
+                    payOrder.setStatus("1");
+                    if(payType.equals("WECHAT")){   //WECHAT:微信,ALIPAY:支付宝,UNIONPAY:
+                        payOrder.setPayType("wx");
+                    }else if(payType.equals("ALIPAY")){
+                        payOrder.setPayType("zfb");
+                    }
+                    payOrder.setAmt(Double.valueOf(amt));
+                    payOrder.setDzkAmt(Double.valueOf("0"));
+                    payOrder.setPayDate(new Timestamp(new Date().getTime()));    //支付时间
+                    payOrder.setReceivedAmt(Double.valueOf(settleAmt)); //settleAmt商家入账金额
+                    //修改订单状态
+                    int count = payOrderService.getUpdatePayOrder(payOrder);
+                    if(count == 1){
+                        //将用户消费的信息插入顾客表： 以手机号 油品名称 油站id为条件插入且存入 加油升数、实收金额、油站名称  根据订单号查询用户手机号
+                        Map<String, Object> infoMap = payOrderService.getOrderInfoAndUserInfoByOrderNo(payOrder);   //获取该订单手机号、加油升数、实收金额、油站名称
+                        logger.info("根据订单查询用户手机号等订单信息"+ infoMap.toString());
+                        //手机号必须有
+                        if(infoMap != null && infoMap.containsKey("mobilePhone") && infoMap.get("mobilePhone") !=null ){
+                            int integral =0;
+                            StationInfo stationInfo = new StationInfo();
+                            stationInfo.setStationId(Integer.valueOf(infoMap.get("stationId").toString()));
+                            StationInfo stationInfos = stationService.selectStationInfo(stationInfo);
+                            if(stationInfos.getIsLngFlagGroup() !=null && stationInfos.getIsLngFlagGroup().equals("1")){
+                                //等于1表示次要业务：LNG集团平台加气（可能会出现）； 插入油站余额记录
+                                StationBalanceChange stationBalanceChange = new StationBalanceChange();
+                                stationBalanceChange.setStationId(stationInfos.getStationId());
+                                stationBalanceChange.setAmt(Double.valueOf(infoMap.get("sellAmt").toString()));
+                                stationBalanceChange.setCreateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(infoMap.get("payDate").toString()));
+                                stationBalanceChange.setType("-");
+                                stationBalanceChange.setOrderNo(ordNo);
+                                stationBalanceChange.setNowAmt(stationInfos.getBalance());
+                                //生成记录
+                                payOrderService.insertStationBalanceExchange(stationBalanceChange);
+                                StationInfo s = new StationInfo();
+                                BigDecimal subtract = new BigDecimal(String.valueOf(stationInfos.getBalance())).subtract(new BigDecimal(infoMap.get("sellAmt").toString()));
+                                s.setBalance(subtract.doubleValue());
+                                s.setStationId(stationInfos.getStationId());
+                                //更新油站余额
+                                stationService.updateStationBalance(s);
+                                logger.info("LNG加气平台支付更新余额完成！");
+                            }
+                            //获取油枪绑定的POS机信息
+                            StationDeviceManager stationDeviceManager = new StationDeviceManager();
+                            stationDeviceManager.setGunNo(infoMap.get("oilGun").toString());
+                            stationDeviceManager.setStationId(Integer.valueOf(infoMap.get("stationId").toString()));
+                            List<StationDeviceManager> stationDeviceManagerList = stationService.getStationDeviceManagerList(stationDeviceManager);
+                            if(stationDeviceManagerList !=null && stationDeviceManagerList.size() >0){
+                                if(stationDeviceManagerList.get(0).getDeviceType() !=null && stationDeviceManagerList.get(0).getDeviceType() !=""){
+                                    switch (stationDeviceManagerList.get(0).getDeviceType()){
+                                        case "1":
+                                            logger.info("小票机打印方式");
+                                            infoMap.put("sn", stationDeviceManagerList.get(0).getDeviceNo());
+                                            infoMap.put("printSetting", stationInfos.getPrintSetting());
+                                            infoMap.put("isLngFlagGroup", stationInfos.getIsLngFlagGroup());
+                                            this.printReceipt(infoMap);
+                                            break;
+                                        case "2":
+                                            logger.info("POS机打印方式");
+                                            payOrder.setIntegral(String.valueOf(integral));
+                                            payOrder.setPrintSetting(stationInfos.getPrintSetting());
+                                            payOrder.setIsLngFlagGroup(stationInfos.getIsLngFlagGroup());
+                                            if(stationInfos.getIsLngFlagGroup() !=null && stationInfos.getIsLngFlagGroup().equals("1")){
+                                                payOrder.setSellAmt(Double.valueOf(infoMap.get("sellAmt").toString()));
+                                            }
+                                            if(stationDeviceManagerList.get(0).getPosFanoutExchange() !=null && stationDeviceManagerList.get(0).getPosQueue() !=null){
+                                                logger.info("POS设备交换机信息:" + stationDeviceManagerList.get(0).getPosFanoutExchange());
+                                                payOrder.setPosFanoutExchange(stationDeviceManagerList.get(0).getPosFanoutExchange());
+                                                payOrder.setPosQueue(stationDeviceManagerList.get(0).getPosQueue());
+                                                payOrder.setDeviceNo(stationDeviceManagerList.get(0).getDeviceNo());
+                                                this.posPrintReceipt(payOrder);
+                                            }
+                                            break;
+                                    }
+                                }
+                            }
+                        }else{
+                            logger.info("该用户无手机号！");
+                        }
+                    }else {
+                        logger.info("更新订单状态失败！");
+                    }
+                }
+            }else {
+                logger.info("该订单不存在！");
+            }
+        }else {
+            logger.info("验签失败");
+            req.put("code","fail");
+            req.put("msg","失败");
+        }
+        logger.info("返回随行付参数信息："+req.toString());
+        return req;
+    }
+
+
 
     @RequestMapping(value = "/posPrintReceiptCeshi", consumes = "application/json", method = RequestMethod.POST)
     @ResponseBody

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

@@ -5,6 +5,7 @@ import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.platform.yijia.config.YiJiaRequest;
 import com.platform.yijia.dao.PayOrderMapper;
+import com.platform.yijia.param.request.PayInfoRequest;
 import com.platform.yijia.param.request.PayOrderRequest;
 import com.platform.yijia.pojo.*;
 import com.platform.yijia.service.*;
@@ -267,8 +268,6 @@ public class PayOrderController {
                                 payOrder.setOilPersonnel(oilPersonnel.substring(0, oilPersonnel.length()-1));   //加油员
                                 payOrder.setOilPersonnelId(oilPersonnelId.substring(0, oilPersonnelId.length()-1));
                             }
-//                            payOrder.setOilPersonnel(mapResultList.get(0).get("").toString());   //加油员
-//                            payOrder.setOilPersonnelId(oilPersonnelId.substring(0, oilPersonnelId.length()-1));
                             payOrderMapper.insertSelective(payOrder);
                             logger.info("返回前端的结果：" +resultMap.toString());
                             resultData = ResultData.success(resultMap);
@@ -2186,6 +2185,126 @@ public class PayOrderController {
     }
 
 
+    //支付宝支付生成订单
+    @RequestMapping(value = "/AddPayOrderFromAliPay", consumes = "application/json", method = RequestMethod.POST)
+    @ResponseBody
+    @Transactional
+    public String  AddPayOrderFromAliPay(@RequestBody PayOrderRequest payOrderRequest){
+        logger.info("支付宝支付----生成订单前端传来参数油站ID："+payOrderRequest.getStationId()+"; 用户openId（用户的userId）："+ payOrderRequest.getOpenId() +";");
+        Gson gson =new GsonBuilder().setDateFormat("yyyy-MM-dd HH:mm:ss").create();
+        ResultData resultData =null;
+        PayOrder payOrder = new PayOrder();             //生成订单参数
+        StationInfo stationInfo = new StationInfo();
+        stationInfo.setStationId(payOrderRequest.getStationId());
+        StationInfo stationInfos = stationService.selectStationInfo(stationInfo);
+        Map<String ,Object> resultMap = new HashMap<>();            //返回结果集
+        if(stationInfos !=null) {
+            payOrder.setStationName(stationInfos.getStationName());
+            //获取油站图片和名称
+            resultMap.put("stationPic", stationInfos.getStationPic());
+            resultMap.put("stationName", stationInfos.getStationName());
+            payOrder.setConsumer(payOrderRequest.getCustomerName());             //昵称
+            payOrder.setConsumerId(1);                 //用户id
+            Random random = new Random();
+            String result = "";
+            for (int i = 0; i < 6; i++) {
+                result += random.nextInt(10);
+            }
+            String ordNo = System.nanoTime() + result;
+            payOrder.setOrderNo(ordNo);                                             //订单号
+            logger.info("生成的订单号：" + ordNo);
+
+            payOrder.setDiscountCouponAmt(payOrderRequest.getDiscountCouponAmt());  //优惠劵金额
+            payOrder.setDiscountCoupon(payOrderRequest.getDiscountCoupon());        //优惠券
+            payOrder.setCarNo(payOrderRequest.getCarNo());                          //车牌号、
+            payOrder.setCustomerGrade(payOrderRequest.getCustomerGrade());          //客户电话
+            payOrder.setMemberNo(payOrderRequest.getMemberNo());                    //会员卡号
+            payOrder.setMemberAmt(payOrderRequest.getMemberAmt());                  //会员支付金额
+            payOrder.setScore(payOrderRequest.getScore());                          //积分
+            payOrder.setStationId(payOrderRequest.getStationId());                  //油站id
+            payOrder.setStatus("0");                                                //创建订单 未支付状态 0
+            payOrder.setCreatedDate(new Timestamp(new Date().getTime()));           //创建时间
+            payOrder.setOrderType(payOrderRequest.getOrderType());                  //订单类型
+            payOrder.setOilGun(payOrderRequest.getOilGun());                        //油枪号
+            payOrder.setReceivableAmt(Double.valueOf(payOrderRequest.getReceivableAmt()));                //订单应收金额
+            String oilName = payOrderRequest.getOilName();
+            //获取该油品所属哪一类
+            Oil oil = new Oil();
+            oil.setOilName(oilName);
+            oil.setDictType("oil_name");
+            Oil oilInfo = sysDictDataService.selectOilType(oil);
+            payOrder.setOilType(oilInfo.getOilsType());                                     //油品类型
+            resultMap.put("cardOilsType", oilInfo.getOilsType());
+            String oilsType = oilInfo.getOilsType();                                        //获取订单类型
+            logger.info("订单油品类型：" + oilsType);
+            payOrder.setOilName(oilName);                                                   //油品名称
+            payOrder.setAmt(Double.valueOf(payOrderRequest.getReceivableAmt()));
+            payOrder.setDiscountAmt(Double.valueOf("0.00"));
+            Map<String, Object> map = new HashMap<>();
+            map.put("oilName", oilName);
+            map.put("stationId", payOrderRequest.getStationId());
+            //获取油站油品价格 优惠方案 是否开启电子卡
+            Map<String, Object> resultOilPrice = stationService.selectStationOilPriceAndDiscountSetting(map);
+            String oilPrice = resultOilPrice.get("oilPrice").toString();                //油站油品价格
+            payOrder.setOilPirce(oilPrice);
+            BigDecimal divide = new BigDecimal(payOrderRequest.getReceivableAmt()).divide(new BigDecimal(oilPrice), 4, BigDecimal.ROUND_HALF_UP);
+            payOrder.setOrderLiters(divide.toString());
+            resultMap.put("discountAmt", "0.00");                                          //优惠价格
+            resultMap.put("amt", payOrderRequest.getReceivableAmt());                   //实收价格
+            resultMap.put("receivableAmt", payOrderRequest.getReceivableAmt());         //应收价格
+            resultMap.put("oilLiters", divide.toString());
+            resultMap.put("discountPrice", oilPrice);
+            resultMap.put("ordNo", ordNo);
+
+            //表示为一人一码：一个加油员一个码
+            Map<String, Object> params = new HashMap<>();
+            params.put("personnelId", payOrderRequest.getPersonnelId());
+            params.put("stationId", payOrderRequest.getStationId());
+            List<Map<String, Object>> list = stationOilGunService.selectOilGunByPersonalId(params);
+            if (list != null && list.size() > 0) {
+                if (list.get(0).containsKey("personnelName") && list.get(0).get("personnelName") != null && list.get(0).get("personnelName").toString() != "") {
+                    payOrder.setOilPersonnel(list.get(0).get("personnelName").toString());
+                    payOrder.setOilPersonnelId(list.get(0).get("personnelId").toString());
+                }
+                payOrderMapper.insertSelective(payOrder);
+                logger.info("返回前端的结果：" +resultMap.toString());
+                resultData = ResultData.success(resultMap);
+            }else {
+                //根据油站和油枪获取加油员
+                HashMap<String, Object> params_1 = new HashMap<>();
+                params_1.put("oliGunNo", payOrderRequest.getOilGun());
+                params_1.put("stationId", payOrderRequest.getStationId());
+                List<Map> mapResultList = payOrderMapper.selectPersonelName(params_1);    //使用list原因：一个枪号对应多个加油员场景
+                logger.info("加油员信息："+ mapResultList.toString());
+                if(mapResultList != null && mapResultList.size() == 1){
+                    String oilPersonnel = "";
+                    String oilPersonnelId ="";
+                    for (Map per : mapResultList){
+                        if(per.containsKey("personnelName") && per.get("personnelName").toString() !=null && per.get("personnelName").toString() !=""){
+                            oilPersonnel += per.get("personnelName").toString() +",";
+                            oilPersonnelId += per.get("personnelId").toString() +",";
+                        }
+                    }
+                    if(oilPersonnel !=""){
+                        payOrder.setOilPersonnel(oilPersonnel.substring(0, oilPersonnel.length()-1));   //加油员
+                        payOrder.setOilPersonnelId(oilPersonnelId.substring(0, oilPersonnelId.length()-1));
+                    }
+                    payOrderMapper.insertSelective(payOrder);
+                    logger.info("返回前端的结果：" +resultMap.toString());
+                    resultData = ResultData.success(resultMap);
+                }else {
+                    resultData = ResultData.error(CodeMsg.MORE_PERSONNAL);
+                }
+            }
+//            payOrderMapper.insertSelective(payOrder);
+//            logger.info("返回前端的结果：" +resultMap.toString());
+//            resultData = ResultData.success(resultMap);
+        }else {
+            resultData = ResultData.error(CodeMsg.STATION_NULL_INFO);
+        }
+        return gson.toJson(resultData);
+    }
+
 
 }
 

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

@@ -500,7 +500,7 @@ public class StationController {
      */
     @RequestMapping(value = "/stationOilGunListNew", method = RequestMethod.GET)
     @ResponseBody
-    public String stationOilGunListNew(@RequestParam Integer stationId, @RequestParam String personnelId){
+    public String stationOilGunListNew(@RequestParam Integer stationId,  String personnelId){
         logger.info("获取油枪接口，油站ID：" + stationId + "; 加油员ID：" + personnelId);
         Gson gson =new GsonBuilder().setDateFormat("yyyy-MM-dd HH:mm:ss").create();
         ResultData resultData = null;

YijiaRestful/src/main/java/com/platform/yijia/utils/CodeMsg.java

@@ -37,6 +37,7 @@ public class CodeMsg {
     public static CodeMsg INTEGRAL_INSUFFICIENT = new CodeMsg(-2,"您的积分不足");
 
     public static CodeMsg NO_PERSONNAL = new CodeMsg(-4,"该油站或油枪未添加或绑定加油员");
+    public static CodeMsg MORE_PERSONNAL = new CodeMsg(-6,"该油站或油枪未有绑定多个加油员");
     public static CodeMsg NO_ENABLE_COUPON = new CodeMsg(-5,"该油站暂未开启积分功能");