"拉卡拉进件支付代码"

pluss-api-page/src/assembly/assembly.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly
+        xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd
+ ">
+    <id>release</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <fileSets>
+        <fileSet>
+            <directory>src/assembly</directory>
+            <outputDirectory>.</outputDirectory>
+            <includes>
+                <include>*.sh</include>
+                <include>*.bat</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>src/main/resources</directory>
+            <outputDirectory>.</outputDirectory>
+            <includes>
+                <include>*.yml</include>
+                <!--<include>application.yml</include>-->
+            </includes>
+        </fileSet>
+    </fileSets>
+
+    <dependencySets>
+        <!-- 将scope为runtime的依赖包打包到lib目录下。 -->
+        <dependencySet>
+            <useProjectArtifact>true</useProjectArtifact>
+            <outputDirectory>libs</outputDirectory>
+            <scope>runtime</scope>
+        </dependencySet>
+    </dependencySets>
+
+</assembly>

pluss-api-page/src/assembly/startup.bat

@@ -0,0 +1,5 @@
+@echo off
+setLocal enableDelayedExpansion
+set cp=.
+FOR %%i IN ("%~dp0libs\*.jar") DO set cp=!cp!;%%~fsi
+start "bidservice" java -cp %cp% Shell

pluss-api-page/src/assembly/startup.sh

@@ -0,0 +1,10 @@
+#!/bin/bash --login
+shopt -s expand_aliases
+
+baseDir=$(cd "$(dirname "$0")"; pwd)
+cp=.
+for file in $baseDir/libs/*.jar
+do
+   cp=$cp:$file
+done
+java  -cp $cp com.goodcoupons.GoodCoupons >>stdout.out 2>&1 &

pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java

@@ -25,6 +25,7 @@ import cn.pluss.platform.ryx.pay.RyxPayService;
 import cn.pluss.platform.sxf.pay.SxfPayService;
 import cn.pluss.platform.user.impl.GeneralPushUtil;
 import cn.pluss.platform.userApp.UserAppService;
+import cn.pluss.platform.util.IpUtils;
 import cn.pluss.platform.util.StringUtil;
 import cn.pluss.platform.util.TokenUtil;
 import cn.pluss.platform.vo.MemberScanVO;
@@ -46,6 +47,7 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -417,7 +419,7 @@ public class MerchantOrderController {
     @ApiOperation(tags = {"页面-收款"}, value = "扫码支付", notes = "扫码支付", httpMethod = "POST")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "MerchantOrderVo", value = "扫码支付需要传递的参数实例", paramType = "body", dataType = "MerchantOrderVo", required = true)})
-    public Result<Object> scanPay(@RequestBody MerChantOrderDTO merchantOrderDTO) {
+    public Result<Object> scanPay(HttpServletRequest request, @RequestBody MerChantOrderDTO merchantOrderDTO) {
         UserApp tokenUa = userAppService.queryUserAppByToken();
         merchantOrderDTO.setMerchantCode(tokenUa.getMerchantCode());
         //校验金额
@@ -425,7 +427,7 @@ public class MerchantOrderController {
             MsgException.throwException("金额异常");
         }
         try {
-            return merchantOrderService.toActivePay(merchantOrderDTO);
+            return merchantOrderService.toActivePay(merchantOrderDTO, IpUtils.getIpAddr(request));
         } catch (Exception e){
             e.printStackTrace();
             return ResultGenerator.genFailResult(e.getMessage());
@@ -437,7 +439,7 @@ public class MerchantOrderController {
      * @return
      */
     @PostMapping("/posScanPay")
-    public Result<Object> posScanPay(@RequestBody MerChantOrderDTO merchantOrderDTO) {
+    public Result<Object> posScanPay(HttpServletRequest request,@RequestBody MerChantOrderDTO merchantOrderDTO) {
         //首先验签
         verify(merchantOrderDTO.getTimestamp(), merchantOrderDTO.getRequestId(), merchantOrderDTO.getAppId(), merchantOrderDTO.getToken());
         //通过后查询商户信息
@@ -451,7 +453,7 @@ public class MerchantOrderController {
         }
         //进行支付操作
         try {
-            Result<Object> activePay = merchantOrderService.toActivePay(merchantOrderDTO);
+            Result<Object> activePay = merchantOrderService.toActivePay(merchantOrderDTO,IpUtils.getIpAddr(request));
             String result = activePay.toString();
             JSONObject jsonData = JSONObject.parseObject(result);
             Object orderNumber = jsonData.getJSONObject("data").get("orderNumber");

pluss-api-page/src/main/java/cn/pluss/platform/controller/merchant/callback/AuditCallbackController.java

@@ -3,6 +3,7 @@ package cn.pluss.platform.controller.merchant.callback;
 import cn.hutool.crypto.symmetric.DES;
 import cn.pluss.platform.channel.MerchantAuditService;
 import cn.pluss.platform.channel.ys.YSAuditServiceV3;
+import cn.pluss.platform.entity.MerchantChannelStatus;
 import cn.pluss.platform.entity.RyxAccessModel;
 import cn.pluss.platform.klk.service.impl.LaKalaInterfaceImpl;
 import cn.pluss.platform.ryx.RyxService;
@@ -151,4 +152,12 @@ public class AuditCallbackController {
     public String lklCallBack(@RequestBody Map<String, Object> map) throws Exception {
        return lklMerAuditService.merchantAuditCallback(map);
     }
+
+
+    @GetMapping("queryMerchantChannelStatus")
+    public MerchantChannelStatus queryMerchantChannelStatus(String customerNo, String externalCustomerNo ) throws Exception {
+        return lklMerAuditService.queryMerchantChannelStatus(customerNo, externalCustomerNo);
+    }
+
+
 }