suochencheng 6 роки тому
батько
коміт
f8b47c5abf

+ 25 - 0
src/main/java/com/izouma/awesomeadmin/constant/PayConstant.java

@@ -0,0 +1,25 @@
+package com.izouma.awesomeadmin.constant;
+
+import com.izouma.awesomeadmin.dto.PayResult;
+import com.izouma.awesomeadmin.enums.PayApiErrCode;
+
+/**
+ * <p>
+ * app常量
+ * </p>
+ */
+public interface PayConstant {
+
+    String SUCCESS = "SUCCESS";
+    String FAIL = "SUCCESS";
+
+    PayResult INVALID_REQUEST = new PayResult(FAIL, PayApiErrCode.INVALID_REQUEST.toString());
+    PayResult MCHID_NOT_EXIST = new PayResult(FAIL, PayApiErrCode.MCHID_NOT_EXIST.toString());
+    PayResult LACK_PARAMS = new PayResult(FAIL, PayApiErrCode.LACK_PARAMS.toString());
+    PayResult SIGNERROR = new PayResult(FAIL, PayApiErrCode.SIGNERROR.toString());
+    PayResult POST_DATA_EMPTY = new PayResult(FAIL, PayApiErrCode.POST_DATA_EMPTY.toString());
+    PayResult NOAUTH = new PayResult(FAIL, PayApiErrCode.NOAUTH.toString());
+
+
+}
+

+ 33 - 1
src/main/java/com/izouma/awesomeadmin/dao/PayCodeOrderMapper.xml

@@ -22,6 +22,8 @@
         <result column="remark" property="remark" jdbcType="VARCHAR"/>
         <result column="product_id" property="productId" jdbcType="INTEGER"/>
         <result column="channel" property="channel" jdbcType="INTEGER"/>
+        <result column="appname" property="appname" jdbcType="VARCHAR"/>
+        <result column="codeowner" property="codeowner" jdbcType="INTEGER"/>
         <!--generatedEnd-->
     </resultMap>
 
@@ -29,7 +31,7 @@
         <!--generatedStart-->
         id, del_flag, update_time, update_user, create_time, create_user, order_code, type_flag,
         code_id, stock_id, pay_type, money, pay_money, status_flag, pay_time, user_id, remark,
-        product_id,channel        <!--generatedEnd-->
+        product_id,channel,appname,codeowner    <!--generatedEnd-->
     </sql>
 
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
@@ -107,6 +109,12 @@
             <if test="channel!= null">
                 channel,
             </if>
+            <if test="appname!= null">
+                appname,
+            </if>
+            <if test="codeowner!= null">
+                codeowner,
+            </if>
             <!--generatedEnd-->
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -168,6 +176,12 @@
             <if test="channel != null">
                 #{channel,jdbcType=INTEGER},
             </if>
+            <if test="appname != null">
+                #{appname},
+            </if>
+            <if test="codeowner != null">
+                #{codeowner,jdbcType=INTEGER},
+            </if>
             <!--generatedEnd-->
         </trim>
     </insert>
@@ -233,6 +247,12 @@
             <if test="channel != null">
                 channel= #{channel,jdbcType=INTEGER},
             </if>
+            <if test="appname != null">
+                appmane= #{appname},
+            </if>
+            <if test="codeowner != null">
+                codeowner= #{codeowner,jdbcType=INTEGER},
+            </if>
             <!--generatedEnd-->
         </set>
         WHERE
@@ -312,6 +332,12 @@
             <if test="record.channel != null and !&quot;&quot;.equals(record.channel)">
                 AND channel = #{record.channel}
             </if>
+            <if test="record.codeowner != null and !&quot;&quot;.equals(record.codeowner)">
+                AND codeowner = #{record.codeowner}
+            </if>
+            <if test="record.appname != null and !&quot;&quot;.equals(record.appname)">
+                AND appname = #{record.appname}
+            </if>
             <!--generatedEnd-->
             <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
                 <trim prefix="and (" suffix=")" prefixOverrides="OR">
@@ -456,6 +482,12 @@
             <if test="channel != null and !&quot;&quot;.equals(channel)">
                 AND channel = #{channel}
             </if>
+            <if test="appname != null and !&quot;&quot;.equals(appname)">
+                AND appname = #{appname}
+            </if>
+            <if test="codeowner != null and !&quot;&quot;.equals(codeowner)">
+                AND codeowner = #{codeowner}
+            </if>
             <!--generatedEnd-->
             <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
                 <trim prefix="and (" suffix=")" prefixOverrides="OR">

+ 27 - 0
src/main/java/com/izouma/awesomeadmin/dao/PayCodeStockMapper.xml

@@ -428,6 +428,15 @@
                 del_flag = 'N'
             AND use_flag = 'Y'
         )
+        AND ( user_id = 0 or  user_id IN (
+            SELECT
+                id
+            FROM
+                sys_user
+            WHERE
+                del_flag = 'N'
+            AND opened = 'Y'
+        ))
         ORDER BY
         money
     </select>
@@ -450,6 +459,15 @@
                 del_flag = 'N'
             AND use_flag = 'Y'
         )
+        AND ( user_id = 0 or  user_id IN (
+        SELECT
+        id
+        FROM
+        sys_user
+        WHERE
+        del_flag = 'N'
+        AND opened = 'Y'
+        ))
         <if test="money != null and !&quot;&quot;.equals(money)">
             AND money = #{money}
         </if>
@@ -475,6 +493,15 @@
                 del_flag = 'N'
             AND use_flag = 'Y'
         )
+        AND ( user_id = 0 or  user_id IN (
+        SELECT
+        id
+        FROM
+        sys_user
+        WHERE
+        del_flag = 'N'
+        AND opened = 'Y'
+        ))
         <if test="codeId != null and !&quot;&quot;.equals(codeId)">
             AND code_id = #{codeId}
         </if>

+ 16 - 1
src/main/java/com/izouma/awesomeadmin/dao/UserInfoMapper.xml

@@ -93,7 +93,7 @@
         country, province, city, district, create_time, del_flag, money_coin, money_point,
         contacter, contact_phone, company_name, company_type, admin_flag, cash_pledge,
         approve_flag, store_flag, company_flag, approve_step, notice_flag, remind_flag,
-        create_flag, level_id, house_card, recommender, money_ticket,channel,apikey
+        create_flag, level_id, house_card, recommender, money_ticket,channel,apikey,opened
     </sql>
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
         select
@@ -227,6 +227,9 @@
             <if test="apikey != null">
                 apikey,
             </if>
+            <if test="opened != null">
+                opened,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -346,6 +349,9 @@
             <if test="apikey != null">
                 #{apikey},
             </if>
+            <if test="opened != null">
+                #{opened},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.UserInfo">
@@ -465,6 +471,9 @@
             <if test="apikey != null">
                 apikey = #{apikey},
             </if>
+            <if test="opened != null">
+                opened = #{opened},
+            </if>
         </set>
         where id = #{id,jdbcType=INTEGER}
     </update>
@@ -578,6 +587,9 @@
             <if test="record.channel != null and !&quot;&quot;.equals(record.channel)">
                 and channel = #{record.channel}
             </if>
+            <if test="record.opened != null and !&quot;&quot;.equals(record.opened)">
+                and opened = #{record.opened}
+            </if>
 
 
             <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
@@ -705,6 +717,9 @@
             <if test="channel != null and !&quot;&quot;.equals(channel)">
                 and channel = #{channel}
             </if>
+            <if test="opened != null and !&quot;&quot;.equals(opened)">
+                and opened = #{opened}
+            </if>
 
             <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
                 <trim prefix="and (" suffix=")" prefixOverrides="OR">

+ 58 - 0
src/main/java/com/izouma/awesomeadmin/dto/PayResult.java

@@ -0,0 +1,58 @@
+package com.izouma.awesomeadmin.dto;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+/**
+ * <p>封装json返回类型。</p>
+ *
+ * @author 姓名 <br />
+ * 更新履历 <br />
+ * 日期 : 姓名: 更新内容<br />
+ * @version 1.0
+ */
+@JsonAutoDetect
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class PayResult {
+
+    private String return_code;
+
+    private Object return_data;
+
+    private String return_msg;
+
+    public String getReturn_code() {
+        return return_code;
+    }
+
+    public void setReturn_code(String return_code) {
+        this.return_code = return_code;
+    }
+
+    public Object getReturn_data() {
+        return return_data;
+    }
+
+    public void setReturn_data(Object return_data) {
+        this.return_data = return_data;
+    }
+
+    public String getReturn_msg() {
+        return return_msg;
+    }
+
+    public void setReturn_msg(String return_msg) {
+        this.return_msg = return_msg;
+    }
+
+    public PayResult(String return_code, String return_msg) {
+        this.return_code = return_code;
+        this.return_msg = return_msg;
+    }
+
+    public PayResult(String return_code, String return_msg, Object return_data) {
+        this.return_code = return_code;
+        this.return_msg = return_msg;
+        this.return_data = return_data;
+    }
+}

+ 8 - 1
src/main/java/com/izouma/awesomeadmin/enums/PayApiErrCode.java

@@ -1,5 +1,7 @@
 package com.izouma.awesomeadmin.enums;
 
+import com.izouma.awesomeadmin.dto.TreeNode;
+
 /**
  * 支付错误码
  */
@@ -27,5 +29,10 @@ public enum PayApiErrCode {
     /**
      * post数据为空
      */
-    POST_DATA_EMPTY
+    POST_DATA_EMPTY,
+
+    /**
+     * 商户无此接口权限
+     */
+    NOAUTH;
 }

+ 23 - 0
src/main/java/com/izouma/awesomeadmin/model/PayCodeOrder.java

@@ -63,6 +63,13 @@ public class PayCodeOrder {
 
     private Date searchEndTime;
 
+    private String appname;
+
+    /**
+     * 支付码拥有人
+     */
+    private Integer codeowner;
+
 
     /*generatedStart*/
     public Integer getId() {
@@ -282,5 +289,21 @@ public class PayCodeOrder {
     public void setSearchEndTime(Date searchEndTime) {
         this.searchEndTime = searchEndTime;
     }
+
+    public String getAppname() {
+        return appname;
+    }
+
+    public void setAppname(String appname) {
+        this.appname = appname;
+    }
+
+    public Integer getCodeowner() {
+        return codeowner;
+    }
+
+    public void setCodeowner(Integer codeowner) {
+        this.codeowner = codeowner;
+    }
 }
 

+ 3 - 3
src/main/java/com/izouma/awesomeadmin/model/PayCodeStock.java

@@ -41,7 +41,7 @@ public class PayCodeStock {
     private String orderByStr;
     /*generatedEnd*/
 
-    private String userId;
+    private Integer userId;
 
     /*generatedStart*/
     public Integer getId() {
@@ -189,11 +189,11 @@ public class PayCodeStock {
     }
     /*generatedEnd*/
 
-    public String getUserId() {
+    public Integer getUserId() {
         return userId;
     }
 
-    public void setUserId(String userId) {
+    public void setUserId(Integer userId) {
         this.userId = userId;
     }
 }

+ 9 - 0
src/main/java/com/izouma/awesomeadmin/model/UserInfo.java

@@ -98,6 +98,7 @@ public class UserInfo {
 
     private String apikey;
 
+    private String opened;
 
     public String getDepartId() {
         return departId;
@@ -435,5 +436,13 @@ public class UserInfo {
     public void setApikey(String apikey) {
         this.apikey = apikey;
     }
+
+    public String getOpened() {
+        return opened;
+    }
+
+    public void setOpened(String opened) {
+        this.opened = opened;
+    }
 }
 

+ 7 - 95
src/main/java/com/izouma/awesomeadmin/service/impl/PayCodeOrderServiceImpl.java

@@ -161,9 +161,6 @@ public class PayCodeOrderServiceImpl implements PayCodeOrderService {
             if (record.getStockId() == null) {
                 return new Result(false, "付款码库存为空");
             }
-            if (record.getProductId() == null) {
-                return new Result(false, "商品Id为空");
-            }
 
             PayCodeStock payCodeStock = new PayCodeStock();
             payCodeStock.setId(record.getStockId());
@@ -187,13 +184,14 @@ public class PayCodeOrderServiceImpl implements PayCodeOrderService {
             record.setPayType(payCodeStock.getPayType());
             record.setCodeId(payCodeStock.getCodeId());
             record.setMoney(payCodeStock.getMoney());
+            record.setCodeowner(payCodeStock.getUserId());
 
             int updates = payCodeOrderMapper.insertSelective(record);
             if (updates > 0) {
                 payCodeStock.setAmount(payCodeStock.getAmount() - 1);
                 payCodeStockMapper.updateByPrimaryKeySelective(payCodeStock);
 
-                return new Result(true, record.getId());
+                return new Result(true, record);
             }
 
 
@@ -228,100 +226,14 @@ public class PayCodeOrderServiceImpl implements PayCodeOrderService {
             payCodeOrderMapper.updateByPrimaryKeySelective(record);
 
 
-            PayCodeInfo payCodeInfo = payCodeOrder.getPayCodeInfo();
-            if (payCodeInfo != null) {
-
-                PayCodeOrder checkPay = new PayCodeOrder();
-                checkPay.setCodeId(payCodeInfo.getId());
-                BigDecimal totalPayMoney = payCodeOrderMapper.getTotalPayMoney(checkPay);
-
-                if (totalPayMoney.compareTo(payCodeInfo.getLimitMoney()) >= 0) {
-                    payCodeInfo.setUseFlag("N");
-                    payCodeInfo.setRemark("超出限制金额,更新为不可以");
-                    payCodeInfoMapper.updateByPrimaryKeySelective(payCodeInfo);
-                } else {
-                    PayCodeStock payCodeStock = payCodeOrder.getPayCodeStock();
-                    if (payCodeStock != null) {
-                        if ("Y".equals(payCodeStock.getRegenerate())) {//再生
-                            payCodeStock.setAmount(payCodeStock.getAmount() + 1);
-                            payCodeStockMapper.updateByPrimaryKeySelective(payCodeStock);
-                        }
-                    }
-                }
-
-
-            }
-
-
-            /**
-             * 二级分润 开始
-             */
-            try {
-                int userId = Integer.valueOf(payCodeOrder.getUserId());
-                UserInfo userInfo = userInfoService.getUserInfoById(userId + "");
-                ChannelInfo channelInfo = channelInfoService.getChannelInfoById(userInfo.getChannel() + "");
-                if (channelInfo != null) {
-                    int ratio = channelInfo.getRatio();
-                    double money = payCodeOrder.getMoney().doubleValue() * ratio / 100.0;
-                    int ratio2 = channelInfo.getRatio2();
-                    double money2 = payCodeOrder.getMoney().doubleValue() * ratio2 / 100.0;
-
-                    int channelRatio = channelInfo.getChannelRatio();
-                    double channelMoney = payCodeOrder.getMoney().doubleValue() * channelRatio / 100.0;
-
-                    Integer channelManagerId = channelInfo.getChannelManager();
-                    if (channelManagerId != null) {
-
-                        UserInfo channelManager = userInfoService.getUserInfoById(channelManagerId + "");
-                        if (channelManager != null) {
-
-                            fenrun(channelMoney, channelManager, "代理商", userInfo, payCodeOrder.getMoney().doubleValue());
-                        }
-
-                    }
-
-
-                    Integer recommenderId = userInfo.getRecommender();
-
-                    if (recommenderId != null) {
-
-                        UserInfo recommender = userInfoService.getUserInfoById(recommenderId + "");
-                        if (recommender != null) {
-
-                            fenrun(money, recommender, "一级招募者", userInfo, payCodeOrder.getMoney().doubleValue());
-                            Integer recommenderId2 = recommender.getRecommender();
-
-
-                            if (recommenderId2 != null) {
-
-                                UserInfo recommender2 = userInfoService.getUserInfoById(recommenderId2 + "");
-                                if (recommender2 != null) {
-
-                                    fenrun(money2, recommender2, "二级招募者", userInfo, payCodeOrder.getMoney().doubleValue());
-                                } else {//如果没有二级,则分润给一级
-                                    fenrun(money2, recommender, "二级招募者", userInfo, payCodeOrder.getMoney().doubleValue());
-                                }
-
-                            } else {
-                                ////如果没有二级,则分润给一级
-                                fenrun(money2, recommender, "二级招募者", userInfo, payCodeOrder.getMoney().doubleValue());
-                            }
-
-                        }
-
-                    }
-
-
+            PayCodeStock payCodeStock = payCodeOrder.getPayCodeStock();
+            if (payCodeStock != null) {
+                if ("Y".equals(payCodeStock.getRegenerate())) {//再生
+                    payCodeStock.setAmount(payCodeStock.getAmount() + 1);
+                    payCodeStockMapper.updateByPrimaryKeySelective(payCodeStock);
                 }
-
-
-            } catch (Exception e) {
-                logger.error("渠道分成异常", e);
             }
 
-            /**
-             * 二级分润 结束
-             */
 
             return new Result(true, "付款成功");
 

+ 852 - 22
src/main/java/com/izouma/awesomeadmin/web/PayApiController.java

@@ -1,11 +1,14 @@
 package com.izouma.awesomeadmin.web;
 
 import com.github.kevinsawicki.http.HttpRequest;
-import com.izouma.awesomeadmin.enums.PayApiErrCode;
+import com.izouma.awesomeadmin.constant.PayConstant;
+import com.izouma.awesomeadmin.dto.PayResult;
+import com.izouma.awesomeadmin.dto.Result;
 import com.izouma.awesomeadmin.model.PayCodeInfo;
+import com.izouma.awesomeadmin.model.PayCodeOrder;
+import com.izouma.awesomeadmin.model.PayCodeStock;
 import com.izouma.awesomeadmin.model.UserInfo;
-import com.izouma.awesomeadmin.service.PayCodeInfoService;
-import com.izouma.awesomeadmin.service.UserInfoService;
+import com.izouma.awesomeadmin.service.*;
 import com.izouma.awesomeadmin.util.MbappUtil;
 import com.izouma.awesomeadmin.util.PayApiUtil;
 import com.izouma.awesomeadmin.util.PropertiesFileLoader;
@@ -17,9 +20,15 @@ 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.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.multipart.commons.CommonsMultipartResolver;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 @Controller
@@ -34,6 +43,16 @@ public class PayApiController {
     @Autowired
     private PayCodeInfoService payCodeInfoService;
 
+    @Autowired
+    private PayCodeStockService payCodeStockService;
+
+    @Autowired
+    private PayCodeOrderService payCodeOrderService;
+
+    @Autowired
+    private OSSFileService OSSFileService;
+
+
     @RequestMapping(value = "/testPush", method = RequestMethod.GET)
     @ResponseBody
     public String testPush(@RequestParam(required = true, value = "abc") String abc) {
@@ -66,6 +85,27 @@ public class PayApiController {
 
     }
 
+    @RequestMapping(value = "/genSign", method = RequestMethod.POST)
+    @ResponseBody
+    public Map genSign(HttpServletRequest request) {
+        try {
+            Map<String, String> notifyMap = getRequstParameter(request);
+
+            String sign = PayApiUtil.generateSignature(notifyMap, notifyMap.get("apikey"));
+            notifyMap.put("sign_type", "MD5");           //签名方式
+            notifyMap.put("sign", sign);                           //签名
+
+            return notifyMap;
+
+        } catch (Exception e) {
+            logger.error("genSign失败", e);
+        }
+
+
+        return null;
+
+    }
+
 
     @RequestMapping(value = "/notify", method = RequestMethod.POST)
     @ResponseBody
@@ -91,23 +131,18 @@ public class PayApiController {
     /**
      * 获取支付码列表
      *
-     * @param request
+     * @param request mch_id
      * @return
      */
     @RequestMapping(value = "/payCodeList", method = RequestMethod.POST)
     @ResponseBody
-    public Map payCodeList(HttpServletRequest request) {
-        Map<String, Object> result = new HashMap<>();
-        result.put("return_code", "FAIL");
-        result.put("return_msg", PayApiErrCode.INVALID_REQUEST);
+    public PayResult payCodeList(HttpServletRequest request) {
         try {
 
             Map<String, String> reqDataMap = getRequstParameter(request);
 
             if (StringUtils.isBlank(reqDataMap.get("mch_id"))) {
-                result.put("return_code", "FAIL");
-                result.put("return_msg", PayApiErrCode.LACK_PARAMS);
-                return result;
+                return PayConstant.LACK_PARAMS;
             }
 
             UserInfo userInfo = new UserInfo();
@@ -115,18 +150,14 @@ public class PayApiController {
             userInfo = userInfoService.getSingleUserInfo(userInfo);
 
             if (userInfo == null) {
-                result.put("return_code", "FAIL");
-                result.put("return_msg", PayApiErrCode.MCHID_NOT_EXIST);
-                return result;
+                return PayConstant.MCHID_NOT_EXIST;
             }
 
             String mch_key = userInfo.getApikey();
 
 
             if (!PayApiUtil.isPayResultNotifySignatureValid(reqDataMap, mch_key)) {
-                result.put("return_code", "FAIL");
-                result.put("return_msg", PayApiErrCode.SIGNERROR);
-                return result;
+                return PayConstant.SIGNERROR;
             }
 
             int userId = userInfo.getId();
@@ -137,11 +168,7 @@ public class PayApiController {
 
             List<PayCodeInfo> payCodeInfoList = payCodeInfoService.getPayCodeInfoList(payCodeInfo);
 
-
-            result.put("return_code", "SUCCESS");
-            result.put("return_msg", "成功");
-            result.put("return_data", payCodeInfoList);
-            return result;
+            return new PayResult(PayConstant.SUCCESS, "成功", payCodeInfoList);
 
 
         } catch (Exception e) {
@@ -149,9 +176,812 @@ public class PayApiController {
         }
 
 
+        return PayConstant.INVALID_REQUEST;
+    }
+
+
+    /**
+     * 获取支付码详情
+     *
+     * @param request mch_id pay_code_id
+     * @return
+     */
+    @RequestMapping(value = "/payCodeDetail", method = RequestMethod.POST)
+    @ResponseBody
+    public PayResult payCodeDetail(HttpServletRequest request) {
+        try {
+
+            Map<String, String> reqDataMap = getRequstParameter(request);
+
+            Map<String, Object> resultUser = getUserInfo(reqDataMap);
+
+            if (resultUser.get("userInfo") == null) {
+                return (PayResult) resultUser.get("result");
+            }
+
+
+            if (StringUtils.isBlank(reqDataMap.get("pay_code_id"))) {
+                return PayConstant.LACK_PARAMS;
+            }
+
+            PayCodeInfo payCodeInfo = payCodeInfoService.getPayCodeInfoById(reqDataMap.get("pay_code_id"));
+
+            return new PayResult(PayConstant.SUCCESS, "成功", payCodeInfo);
+
+
+        } catch (Exception e) {
+            logger.error("获取支付码详情异常", e);
+        }
+
+
+        return PayConstant.INVALID_REQUEST;
+    }
+
+
+    /**
+     * 获取支付码库存列表
+     *
+     * @param request mch_id
+     * @return
+     */
+    @RequestMapping(value = "/payCodeStockList", method = RequestMethod.POST)
+    @ResponseBody
+    public PayResult payCodeStockList(HttpServletRequest request) {
+        try {
+
+            Map<String, String> reqDataMap = getRequstParameter(request);
+
+
+            Map<String, Object> resultUser = getUserInfo(reqDataMap);
+
+            if (resultUser.get("userInfo") == null) {
+                return (PayResult) resultUser.get("result");
+            }
+
+
+            if (StringUtils.isBlank(reqDataMap.get("pay_code_id"))) {
+                return PayConstant.LACK_PARAMS;
+            }
+
+            UserInfo userInfo = (UserInfo) resultUser.get("userInfo");
+            int userId = userInfo.getId();
+            int codeId = Integer.valueOf(reqDataMap.get("pay_code_id"));
+
+            PayCodeStock payCodeStock = new PayCodeStock();
+            payCodeStock.setCodeId(codeId);
+            payCodeStock.setUserId(userId);
+
+            List<PayCodeStock> payCodeStockList = payCodeStockService.getPayCodeStockList(payCodeStock);
+
+            return new PayResult(PayConstant.SUCCESS, "成功", payCodeStockList);
+
+
+        } catch (Exception e) {
+            logger.error("获取支付码库存列表异常", e);
+        }
+
+
+        return PayConstant.INVALID_REQUEST;
+    }
+
+
+    /**
+     * 获取全部可用价格
+     *
+     * @param request mch_id
+     * @return
+     */
+    @RequestMapping(value = "/allUsedMoney", method = RequestMethod.POST)
+    @ResponseBody
+    public PayResult allUsedMoney(HttpServletRequest request) {
+        try {
+
+            Map<String, String> reqDataMap = getRequstParameter(request);
+
+
+            Map<String, Object> resultUser = getUserInfo(reqDataMap);
+
+            if (resultUser.get("userInfo") == null) {
+                return (PayResult) resultUser.get("result");
+            }
+
+
+            List<PayCodeStock> payCodeStockList = payCodeStockService.getPayCodeStockAllUsedMoney(null);
+
+            return new PayResult(PayConstant.SUCCESS, "成功", payCodeStockList);
+
+
+        } catch (Exception e) {
+            logger.error("获取支付码库存列表异常", e);
+        }
+
+        return PayConstant.INVALID_REQUEST;
+    }
+
+
+    /**
+     * 根据金额获取全部可用付款类型
+     *
+     * @param request mch_id money
+     * @return
+     */
+    @RequestMapping(value = "/allUsedPayType", method = RequestMethod.POST)
+    @ResponseBody
+    public PayResult allUsedPayType(HttpServletRequest request) {
+        try {
+
+            Map<String, String> reqDataMap = getRequstParameter(request);
+
+
+            Map<String, Object> resultUser = getUserInfo(reqDataMap);
+
+            if (resultUser.get("userInfo") == null) {
+                return (PayResult) resultUser.get("result");
+            }
+
+            PayCodeStock payCodeStock = new PayCodeStock();
+
+            if (StringUtils.isNotBlank(reqDataMap.get("money"))) {
+                payCodeStock.setMoney(BigDecimal.valueOf(Integer.valueOf(reqDataMap.get("money"))));
+            }
+
+
+            List<PayCodeStock> payCodeStockList = payCodeStockService.getPayCodeStockAllUsedPayType(payCodeStock);
+
+            return new PayResult(PayConstant.SUCCESS, "成功", payCodeStockList);
+
+
+        } catch (Exception e) {
+            logger.error("获取支付码库存列表异常", e);
+        }
+
+        return PayConstant.INVALID_REQUEST;
+    }
+
+    /**
+     * 随机获取可用付款库存
+     *
+     * @param request mch_id payType money
+     * @return
+     */
+    @RequestMapping(value = "/randomStock", method = RequestMethod.POST)
+    @ResponseBody
+    public PayResult randomStock(HttpServletRequest request) {
+        try {
+
+            Map<String, String> reqDataMap = getRequstParameter(request);
+
+
+            Map<String, Object> resultUser = getUserInfo(reqDataMap);
+
+            if (resultUser.get("userInfo") == null) {
+                return (PayResult) resultUser.get("result");
+            }
+
+            if (StringUtils.isBlank(reqDataMap.get("payType")) ||
+                    StringUtils.isBlank(reqDataMap.get("money"))) {
+                return PayConstant.LACK_PARAMS;
+            }
+
+
+            PayCodeStock payCodeStock = new PayCodeStock();
+            payCodeStock.setMoney(BigDecimal.valueOf(Integer.valueOf(reqDataMap.get("money"))));
+            payCodeStock.setPayType(reqDataMap.get("payType"));
+
+            PayCodeStock pp = payCodeStockService.getRandomStock(payCodeStock);
+
+            return new PayResult(PayConstant.SUCCESS, "成功", pp);
+
+
+        } catch (Exception e) {
+            logger.error("获取支付码库存列表异常", e);
+        }
+
+        return PayConstant.INVALID_REQUEST;
+    }
+
+
+    /**
+     * 提交订单
+     *
+     * @param request mch_id stockId appname
+     * @return
+     */
+    @RequestMapping(value = "/submitOrder", method = RequestMethod.POST)
+    @ResponseBody
+    public PayResult submitOrder(HttpServletRequest request) {
+        try {
+
+            Map<String, String> reqDataMap = getRequstParameter(request);
+
+
+            Map<String, Object> resultUser = getUserInfo(reqDataMap);
+
+            if (resultUser.get("userInfo") == null) {
+                return (PayResult) resultUser.get("result");
+            }
+
+            if (StringUtils.isBlank(reqDataMap.get("stockId")) ||
+                    StringUtils.isBlank(reqDataMap.get("appname"))) {
+                return PayConstant.LACK_PARAMS;
+            }
+
+            UserInfo userInfo = (UserInfo) resultUser.get("userInfo");
+            int userId = userInfo.getId();
+
+
+            PayCodeOrder payCodeOrder = new PayCodeOrder();
+            payCodeOrder.setStockId(Integer.valueOf(reqDataMap.get("stockId")));
+            payCodeOrder.setUserId(userId);
+            payCodeOrder.setAppname(reqDataMap.get("appname"));
+
+            Result pp = payCodeOrderService.submit(payCodeOrder);
+
+            return new PayResult(PayConstant.SUCCESS, "成功", pp);
+
+
+        } catch (Exception e) {
+            logger.error("提交订单异常", e);
+        }
+
+        return PayConstant.INVALID_REQUEST;
+    }
+
+
+    /**
+     * 查询订单详情
+     *
+     * @param request mch_id orderCode
+     * @return
+     */
+    @RequestMapping(value = "/orderDetail", method = RequestMethod.POST)
+    @ResponseBody
+    public PayResult orderDetail(HttpServletRequest request) {
+        try {
+
+            Map<String, String> reqDataMap = getRequstParameter(request);
+
+
+            Map<String, Object> resultUser = getUserInfo(reqDataMap);
+
+            if (resultUser.get("userInfo") == null) {
+                return (PayResult) resultUser.get("result");
+            }
+
+            if (StringUtils.isBlank(reqDataMap.get("orderCode"))) {
+                return PayConstant.LACK_PARAMS;
+            }
+
+            PayCodeOrder payCodeOrder = new PayCodeOrder();
+            payCodeOrder.setOrderCode(reqDataMap.get("orderCode"));
+
+            PayCodeOrder pp = payCodeOrderService.getPayCodeOrder(payCodeOrder);
+
+            return new PayResult(PayConstant.SUCCESS, "成功", pp);
+
+
+        } catch (Exception e) {
+            logger.error("查询订单详情异常", e);
+        }
+
+        return PayConstant.INVALID_REQUEST;
+    }
+
+
+    /**
+     * 查询订单列表(codeowner)
+     *
+     * @param request mch_id  statusFlag
+     * @return
+     */
+    @RequestMapping(value = "/codeownerOrderList", method = RequestMethod.POST)
+    @ResponseBody
+    public PayResult codeownerOrderList(HttpServletRequest request) {
+        try {
+
+            Map<String, String> reqDataMap = getRequstParameter(request);
+
+
+            Map<String, Object> resultUser = getUserInfo(reqDataMap);
+
+            if (resultUser.get("userInfo") == null) {
+                return (PayResult) resultUser.get("result");
+            }
+
+
+            UserInfo userInfo = (UserInfo) resultUser.get("userInfo");
+            int userId = userInfo.getId();
+
+            PayCodeOrder payCodeOrder = new PayCodeOrder();
+            payCodeOrder.setCodeowner(userId);
+
+
+            if (StringUtils.isNotBlank(reqDataMap.get("statusFlag"))) {
+                payCodeOrder.setStatusFlag(Integer.valueOf(reqDataMap.get("statusFlag")));
+            }
+
+            List<PayCodeOrder> pp = payCodeOrderService.getPayCodeOrderList(payCodeOrder);
+
+            return new PayResult(PayConstant.SUCCESS, "成功", pp);
+
+
+        } catch (Exception e) {
+            logger.error("查询订单列表(codeowner)异常", e);
+        }
+
+        return PayConstant.INVALID_REQUEST;
+    }
+
+
+    /**
+     * 查询订单列表(下单)
+     *
+     * @param request mch_id  statusFlag
+     * @return
+     */
+    @RequestMapping(value = "/myOrderList", method = RequestMethod.POST)
+    @ResponseBody
+    public PayResult myOrderList(HttpServletRequest request) {
+        try {
+
+            Map<String, String> reqDataMap = getRequstParameter(request);
+
+
+            Map<String, Object> resultUser = getUserInfo(reqDataMap);
+
+            if (resultUser.get("userInfo") == null) {
+                return (PayResult) resultUser.get("result");
+            }
+
+
+            UserInfo userInfo = (UserInfo) resultUser.get("userInfo");
+            int userId = userInfo.getId();
+
+            PayCodeOrder payCodeOrder = new PayCodeOrder();
+            payCodeOrder.setUserId(userId);
+
+
+            if (StringUtils.isNotBlank(reqDataMap.get("statusFlag"))) {
+                payCodeOrder.setStatusFlag(Integer.valueOf(reqDataMap.get("statusFlag")));
+            }
+
+            List<PayCodeOrder> pp = payCodeOrderService.getPayCodeOrderList(payCodeOrder);
+
+            return new PayResult(PayConstant.SUCCESS, "成功", pp);
+
+        } catch (Exception e) {
+            logger.error("查询订单列表(codeowner)异常", e);
+        }
+
+        return PayConstant.INVALID_REQUEST;
+    }
+
+
+    /**
+     * 支付订单
+     *
+     * @param request mch_id  orderCode remark
+     * @return
+     */
+    @RequestMapping(value = "/pay", method = RequestMethod.POST)
+    @ResponseBody
+    public PayResult pay(HttpServletRequest request) {
+        try {
+
+            Map<String, String> reqDataMap = getRequstParameter(request);
+
+
+            Map<String, Object> resultUser = getUserInfo(reqDataMap);
+
+            if (resultUser.get("userInfo") == null) {
+                return (PayResult) resultUser.get("result");
+            }
+
+            if (StringUtils.isBlank(reqDataMap.get("orderCode"))) {
+                return PayConstant.LACK_PARAMS;
+            }
+
+            UserInfo userInfo = (UserInfo) resultUser.get("userInfo");
+            int userId = userInfo.getId();
+
+
+            PayCodeOrder payCodeOrder = new PayCodeOrder();
+            payCodeOrder.setOrderCode(reqDataMap.get("orderCode"));
+
+            PayCodeOrder pp = payCodeOrderService.getPayCodeOrder(payCodeOrder);
+            if (userId != pp.getCodeowner()) {
+                return PayConstant.NOAUTH;
+            }
+
+            payCodeOrder.setId(pp.getId());
+            payCodeOrder.setPayMoney(pp.getMoney());
+            payCodeOrder.setRemark(reqDataMap.get("remark"));
+
+            Result result = payCodeOrderService.pay(payCodeOrder);
+
+            return new PayResult(PayConstant.SUCCESS, "成功", result);
+
+        } catch (Exception e) {
+            logger.error("查询订单列表(codeowner)异常", e);
+        }
+
+        return PayConstant.INVALID_REQUEST;
+    }
+
+
+    /**
+     * 更新接单状态
+     *
+     * @param request mch_id  opened
+     * @return
+     */
+    @RequestMapping(value = "/opened", method = RequestMethod.POST)
+    @ResponseBody
+    public PayResult opened(HttpServletRequest request) {
+        try {
+
+            Map<String, String> reqDataMap = getRequstParameter(request);
+
+
+            Map<String, Object> resultUser = getUserInfo(reqDataMap);
+
+            if (resultUser.get("userInfo") == null) {
+                return (PayResult) resultUser.get("result");
+            }
+
+            if (StringUtils.isBlank(reqDataMap.get("opened"))) {
+                return PayConstant.LACK_PARAMS;
+            }
+
+            UserInfo userInfo = (UserInfo) resultUser.get("userInfo");
+            int userId = userInfo.getId();
+
+            UserInfo updateUser = new UserInfo();
+            updateUser.setId(userId);
+            updateUser.setOpened(reqDataMap.get("opened"));
+
+            userInfoService.updateUserInfo(updateUser);
+
+            return new PayResult(PayConstant.SUCCESS, "成功");
+
+        } catch (Exception e) {
+            logger.error("更新接单状态异常", e);
+        }
+
+        return PayConstant.INVALID_REQUEST;
+    }
+
+
+    /**
+     * 创建支付码
+     *
+     * @param request mch_id  codeName payType image
+     * @return
+     */
+    @RequestMapping(value = "/createPayCodeInfo", method = RequestMethod.POST)
+    @ResponseBody
+    public PayResult createPayCodeInfo(HttpServletRequest request) {
+        try {
+
+            Map<String, String> reqDataMap = getRequstParameter(request);
+
+
+            Map<String, Object> resultUser = getUserInfo(reqDataMap);
+
+            if (resultUser.get("userInfo") == null) {
+                return (PayResult) resultUser.get("result");
+            }
+
+            if (StringUtils.isBlank(reqDataMap.get("codeName")) ||
+                    StringUtils.isBlank(reqDataMap.get("payType")) ||
+                    StringUtils.isBlank(reqDataMap.get("image"))) {
+                return PayConstant.LACK_PARAMS;
+            }
+
+            UserInfo userInfo = (UserInfo) resultUser.get("userInfo");
+            int userId = userInfo.getId();
+
+
+            PayCodeInfo payCodeInfo = new PayCodeInfo();
+            payCodeInfo.setUserId(userId);
+            payCodeInfo.setCodeName(reqDataMap.get("codeName"));
+            payCodeInfo.setPayType(reqDataMap.get("payType"));
+            payCodeInfo.setImage(reqDataMap.get("image"));
+            payCodeInfo.setUseFlag("Y");
+
+            payCodeInfoService.createPayCodeInfo(payCodeInfo);
+
+
+            return new PayResult(PayConstant.SUCCESS, "成功", payCodeInfo);
+
+        } catch (Exception e) {
+            logger.error("查询订单列表(codeowner)异常", e);
+        }
+
+        return PayConstant.INVALID_REQUEST;
+    }
+
+
+    /**
+     * 更新支付码
+     *
+     * @param request mch_id  pay_code_id codeName payType image,autoTimeover
+     * @return
+     */
+    @RequestMapping(value = "/updatePayCodeInfo", method = RequestMethod.POST)
+    @ResponseBody
+    public PayResult updatePayCodeInfo(HttpServletRequest request) {
+        try {
+
+            Map<String, String> reqDataMap = getRequstParameter(request);
+
+
+            Map<String, Object> resultUser = getUserInfo(reqDataMap);
+
+            if (resultUser.get("userInfo") == null) {
+                return (PayResult) resultUser.get("result");
+            }
+
+
+            if (StringUtils.isBlank(reqDataMap.get("pay_code_id"))) {
+                return PayConstant.LACK_PARAMS;
+            }
+
+            UserInfo userInfo = (UserInfo) resultUser.get("userInfo");
+            int userId = userInfo.getId();
+            int codeId = Integer.valueOf(reqDataMap.get("pay_code_id"));
+
+
+            PayCodeInfo pp = payCodeInfoService.getPayCodeInfoById(reqDataMap.get("pay_code_id"));
+            if (userId != pp.getUserId()) {
+                return PayConstant.NOAUTH;
+            }
+
+            PayCodeInfo payCodeInfo = new PayCodeInfo();
+            payCodeInfo.setId(codeId);
+
+            if (StringUtils.isNotBlank(reqDataMap.get("codeName"))) {
+                payCodeInfo.setCodeName(reqDataMap.get("codeName"));
+            }
+            if (StringUtils.isNotBlank(reqDataMap.get("payType"))) {
+                payCodeInfo.setPayType(reqDataMap.get("payType"));
+            }
+
+            if (StringUtils.isNotBlank(reqDataMap.get("image"))) {
+                payCodeInfo.setImage(reqDataMap.get("image"));
+            }
+            if (StringUtils.isNotBlank(reqDataMap.get("autoTimeover"))) {
+
+                payCodeInfo.setAutoTimeover(reqDataMap.get("autoTimeover"));
+            }
+
+            payCodeInfoService.updatePayCodeInfo(payCodeInfo);
+
+
+            return new PayResult(PayConstant.SUCCESS, "成功", payCodeInfo);
+
+        } catch (Exception e) {
+            logger.error("更新支付码异常", e);
+        }
+
+        return PayConstant.INVALID_REQUEST;
+    }
+
+
+    /**
+     * 创建付款码库存
+     *
+     * @param request mch_id  pay_code_id name money amount,regenerate
+     * @return
+     */
+    @RequestMapping(value = "/createPayCodeStock", method = RequestMethod.POST)
+    @ResponseBody
+    public PayResult createPayCodeStock(HttpServletRequest request) {
+        try {
+
+            Map<String, String> reqDataMap = getRequstParameter(request);
+
+
+            Map<String, Object> resultUser = getUserInfo(reqDataMap);
+
+            if (resultUser.get("userInfo") == null) {
+                return (PayResult) resultUser.get("result");
+            }
+
+
+            if (StringUtils.isBlank(reqDataMap.get("pay_code_id")) ||
+                    StringUtils.isBlank(reqDataMap.get("name")) ||
+                    StringUtils.isBlank(reqDataMap.get("money")) ||
+                    StringUtils.isBlank(reqDataMap.get("amount")) ||
+                    StringUtils.isBlank(reqDataMap.get("regenerate"))) {
+                return PayConstant.LACK_PARAMS;
+            }
+
+            UserInfo userInfo = (UserInfo) resultUser.get("userInfo");
+            int userId = userInfo.getId();
+            int codeId = Integer.valueOf(reqDataMap.get("pay_code_id"));
+
+
+            PayCodeInfo pp = payCodeInfoService.getPayCodeInfoById(reqDataMap.get("pay_code_id"));
+            if (userId != pp.getUserId()) {
+                return PayConstant.NOAUTH;
+            }
+
+
+            PayCodeStock payCodeStock = new PayCodeStock();
+            payCodeStock.setUseFlag("Y");
+            payCodeStock.setCodeId(codeId);
+            payCodeStock.setName(reqDataMap.get("name"));
+            payCodeStock.setPayType(pp.getPayType());
+            payCodeStock.setAmount(Integer.valueOf(reqDataMap.get("amount")));
+            payCodeStock.setMoney(BigDecimal.valueOf(Integer.valueOf(reqDataMap.get("money"))));
+            payCodeStock.setRegenerate(reqDataMap.get("regenerate"));
+            payCodeStock.setUserId(userId);
+
+            payCodeStockService.createPayCodeStock(payCodeStock);
+
+
+            return new PayResult(PayConstant.SUCCESS, "成功", payCodeStock);
+
+        } catch (Exception e) {
+            logger.error("创建付款码库存 异常", e);
+        }
+
+        return PayConstant.INVALID_REQUEST;
+    }
+
+
+    /**
+     * 更新付款码库存
+     *
+     * @param request mch_id  stock_id name money amount,regenerate
+     * @return
+     */
+    @RequestMapping(value = "/updatePayCodeStock", method = RequestMethod.POST)
+    @ResponseBody
+    public PayResult updatePayCodeStock(HttpServletRequest request) {
+        try {
+
+            Map<String, String> reqDataMap = getRequstParameter(request);
+
+
+            Map<String, Object> resultUser = getUserInfo(reqDataMap);
+
+            if (resultUser.get("userInfo") == null) {
+                return (PayResult) resultUser.get("result");
+            }
+
+
+            if (StringUtils.isBlank(reqDataMap.get("stock_id"))) {
+                return PayConstant.LACK_PARAMS;
+            }
+
+            UserInfo userInfo = (UserInfo) resultUser.get("userInfo");
+            int userId = userInfo.getId();
+            int stockId = Integer.valueOf(reqDataMap.get("stock_id"));
+
+
+            PayCodeStock pp = payCodeStockService.getPayCodeStockById(reqDataMap.get("stock_id"));
+            if (userId != pp.getUserId()) {
+                return PayConstant.NOAUTH;
+            }
+
+
+            PayCodeStock payCodeStock = new PayCodeStock();
+            payCodeStock.setId(stockId);
+
+            if (StringUtils.isNotBlank(reqDataMap.get("name"))) {
+
+                payCodeStock.setName(reqDataMap.get("name"));
+            }
+
+            if (StringUtils.isNotBlank(reqDataMap.get("amount"))) {
+
+                payCodeStock.setAmount(Integer.valueOf(reqDataMap.get("amount")));
+            }
+
+            if (StringUtils.isNotBlank(reqDataMap.get("money"))) {
+                payCodeStock.setMoney(BigDecimal.valueOf(Integer.valueOf(reqDataMap.get("money"))));
+            }
+
+            if (StringUtils.isNotBlank(reqDataMap.get("regenerate"))) {
+                payCodeStock.setRegenerate(reqDataMap.get("regenerate"));
+            }
+
+            payCodeStockService.updatePayCodeStock(payCodeStock);
+
+
+            return new PayResult(PayConstant.SUCCESS, "成功", payCodeStock);
+
+        } catch (Exception e) {
+            logger.error("创建付款码库存 异常", e);
+        }
+
+        return PayConstant.INVALID_REQUEST;
+    }
+
+
+    @RequestMapping(value = "/uploadFile")
+    @ResponseBody
+    public PayResult uploadFile(HttpServletRequest request) {
+
+        try {
+
+            Map<String, String> reqDataMap = getRequstParameter(request);
+
+
+            Map<String, Object> resultUser = getUserInfo(reqDataMap);
+
+            if (resultUser.get("userInfo") == null) {
+                return (PayResult) resultUser.get("result");
+            }
+
+            CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(request.getSession().getServletContext());
+            if (multipartResolver.isMultipart(request)) {
+                MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) request;
+                Iterator it = multiRequest.getFileNames();
+                List<String> paths = new ArrayList<>();
+                while (it.hasNext()) {
+                    MultipartFile file = multiRequest.getFile(it.next().toString());
+                    if (file != null) {
+                        try {
+                            Random random = new Random();
+                            StringBuilder randomCode = new StringBuilder();
+                            for (int i = 0; i < 8; i++) {
+                                randomCode.append(Integer.toString(random.nextInt(36), 36));
+                            }
+                            String ext = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
+                            String fileType = file.getContentType().substring(0, file.getContentType().indexOf("/"));
+                            String uploadPath = String.format("%s/%s-%s%s", fileType, new SimpleDateFormat("yyyy-MM-dd-hh-mm-ss").format(new Date()), randomCode, ext);
+                            String path = OSSFileService.upload(file.getInputStream(), uploadPath);
+                            paths.add(path);
+                        } catch (IOException e) {
+                            e.printStackTrace();
+                            return PayConstant.INVALID_REQUEST;
+                        }
+                    }
+                }
+                return new PayResult(PayConstant.SUCCESS, "成功", paths);
+            }
+        } catch (Exception e) {
+            logger.error("创建付款码库存 异常", e);
+        }
+
+        return PayConstant.INVALID_REQUEST;
+    }
+
+
+    private Map<String, Object> getUserInfo(Map<String, String> reqDataMap) throws Exception {
+
+        Map<String, Object> result = new HashMap<>();
+        if (StringUtils.isBlank(reqDataMap.get("mch_id"))) {
+            result.put("result", PayConstant.LACK_PARAMS);
+            return result;
+        }
+
+        UserInfo userInfo = new UserInfo();
+        userInfo.setPhone(reqDataMap.get("mch_id"));
+        userInfo = userInfoService.getSingleUserInfo(userInfo);
+
+        if (userInfo == null) {
+            result.put("result", PayConstant.MCHID_NOT_EXIST);
+            return result;
+        }
+
+
+        String mch_key = userInfo.getApikey();
+
+        if (!PayApiUtil.isPayResultNotifySignatureValid(reqDataMap, mch_key)) {
+
+            result.put("result", PayConstant.SIGNERROR);
+            return result;
+        }
+
+        result.put("userInfo", userInfo);
         return result;
     }
 
+
     private Map<String, String> getRequstParameter(HttpServletRequest request) {
         Map<String, String> reqDataMap = new HashMap<>();