XF--LRQYEJOKYDS\Administrator преди 4 години
родител
ревизия
372e5cdd4d

+ 75 - 0
YijiaRestful/src/main/java/com/platform/yijia/controller/AppUserInfoController.java

@@ -0,0 +1,75 @@
+package com.platform.yijia.controller;
+
+import com.google.gson.Gson;
+import com.platform.yijia.param.request.AppUserInfoRequest;
+import com.platform.yijia.param.request.StationRequest;
+
+import com.platform.yijia.pojo.AppUserInfo;
+import com.platform.yijia.service.AppUserInfoService;
+import com.platform.yijia.utils.CodeMsg;
+import com.platform.yijia.utils.ResultData;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+public class AppUserInfoController {
+    private static Logger logger =(Logger) LoggerFactory.getLogger(PayController.class);
+    @Resource
+    private AppUserInfoService appUserInfoService;
+
+    /**
+     * 添加用户信息
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/addAppUserInfo", method = RequestMethod.POST)
+    @ResponseBody
+    public String addAppUserInfo(@RequestBody AppUserInfoRequest request){
+        Gson gson =new Gson();
+        ResultData resultData=null;
+        AppUserInfo appUserInfo =new AppUserInfo();
+        if(request.getUserType()!=null){
+            if(request.getUserType().equals("1") &&StringUtils.isNotBlank(request.getBlogOpenid())&&StringUtils.isNotBlank(request.getBlogToken())){
+                appUserInfo.setUserType(request.getUserType());
+                appUserInfo.setBlogToken(request.getBlogToken());
+                appUserInfo.setBlogOpenid(request.getBlogOpenid());
+            }else if(request.getUserType().equals("2") &&StringUtils.isNotBlank(request.getMinaOpenid())&&StringUtils.isNotBlank(request.getMinaToken())){
+                appUserInfo.setUserType(request.getUserType());
+                appUserInfo.setMinaToken(request.getMinaToken());
+                appUserInfo.setMinaOpenid(request.getMinaOpenid());
+            }
+
+        }
+        if(StringUtils.isNotBlank(request.getBlogNickName())){
+            appUserInfo.setBlogNickName(request.getBlogNickName());
+        }
+        if(StringUtils.isNotBlank(request.getMobilePhone())){
+            appUserInfo.setMobilePhone(request.getMobilePhone());
+        }
+        if(StringUtils.isNotBlank(request.getBlogProfilePhoto())){
+            appUserInfo.setBlogProfilePhoto(request.getBlogProfilePhoto());
+        }
+//        if(StringUtils.isNotBlank(request.getRegisteDate())){
+//            appUserInfo.setRegisteDate(request.getRegisteDate());
+//        }
+//        if(StringUtils.isNotBlank(request.getUpdateDate())){
+//            appUserInfo.setUpdateDate(request.getUpdateDate());
+//        }
+        if(StringUtils.isNotBlank(request.getSexFlag())){
+            appUserInfo.setSexFlag(request.getSexFlag());
+        }
+
+        try{
+            appUserInfoService.AddAppUserInfo(appUserInfo);
+            resultData=ResultData.success(CodeMsg.SUCCESS);
+        }catch (Exception e){
+            resultData=ResultData.error(CodeMsg.INSERT_FAIL);
+            e.printStackTrace();
+        }
+        return gson.toJson(resultData);
+    }
+
+}

+ 20 - 4
YijiaRestful/src/main/java/com/platform/yijia/controller/PayController.java

@@ -171,7 +171,7 @@ public class PayController {
                       //reqData.put("subAppid", "wx24210004370ec43b"); //微信子公众号
                     //reqData.put("outFrontUrl", ""); //js 支付,前台 成功通知地址
                     //reqData.put("outFrontFailUrl", ""); //js 支付,前台 事变通知地址
-                    //reqData.put("notifyUrl", ""); //回调地址
+                    reqData.put("notifyUrl", "http://m.huiyj.com/yijia-pay/api/getCallback"); //回调地址
                     //reqData.put("needReceipt", "00"); //电子发票功能 微信开具电子 发票使用
                     //reqData.put("ledgerAccountFlag", "00"); //是否做分账 分账交易使 用;00:做; 01:不做;不传默认为不做分账
                     //reqData.put("ledgerAccountEffectTime", "00"); //分账有效时间 单位为天;是 否做分账选择 00 时该字段必传
@@ -349,7 +349,6 @@ public class PayController {
     public void getCallback(HttpServletRequest request,HttpServletResponse response){
         logger.info("回调返回过来的参数"+request);
         Gson gson =new Gson();
-        logger.info("回调返回过来的参数json:--"+gson.toJson(request));
         //获取回调参数信息
         String uuid=request.getParameter("uuid");////随行付交易流水号
         String mno=request.getParameter("mno");//发起交易的商户编号
@@ -414,6 +413,7 @@ public class PayController {
         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)) {
             System.out.println("===================验签成功==============");
@@ -423,15 +423,31 @@ public class PayController {
             logger.info("根据订单号,查询订单"+gson.toJson(list));
             if (list != null && list.size() == 1) {
                 String status = list.get(0).getStatus();
+                int ordId= list.get(0).getOrderId();
                 //状态为未支付 1  修改状态为已支付
                 if (status.equals("1")) {
                     PayOrder payOrder = new PayOrder();
-                    //payOrder.setOrderNo(callBack.getOrdNo());
+                    payOrder.setOrderId(ordId);
                     payOrder.setStatus("2");
                     //根据修改状态
-                    //payOrderService.getUpdatePayOrder(payOrder);
+                    payOrderService.getUpdatePayOrder(payOrder);
+                    req.put("code","success");
+                    req.put("msg","成功");
                 }
             }
+        }else {
+            logger.info("验签失败");
+            req.put("code","fail");
+            req.put("msg","失败");
+        }
+        try {
+            response.setContentType("application/json; charset=UTF-8");
+            response.setCharacterEncoding("UTF-8");
+            response.getWriter().print(req);
+            response.getWriter().flush();
+            response.getWriter().close();
+        }catch (Exception e){
+            e.printStackTrace();
         }
     }
 }

+ 103 - 0
YijiaRestful/src/main/java/com/platform/yijia/param/request/AppUserInfoRequest.java

@@ -0,0 +1,103 @@
+package com.platform.yijia.param.request;
+
+public class AppUserInfoRequest {
+    private String userType;
+    private String blogOpenid;
+    private String minaOpenid;
+    private String mobilePhone;
+    private String blogNickName;
+    private String sexFlag;
+    private String registeDate;
+    private String blogToken;
+    private String minaToken;
+    private String blogProfilePhoto;
+    private String updateDate;
+
+    public String getUserType() {
+        return userType;
+    }
+
+    public void setUserType(String userType) {
+        this.userType = userType;
+    }
+
+    public String getBlogOpenid() {
+        return blogOpenid;
+    }
+
+    public void setBlogOpenid(String blogOpenid) {
+        this.blogOpenid = blogOpenid;
+    }
+
+    public String getMinaOpenid() {
+        return minaOpenid;
+    }
+
+    public void setMinaOpenid(String minaOpenid) {
+        this.minaOpenid = minaOpenid;
+    }
+
+    public String getMobilePhone() {
+        return mobilePhone;
+    }
+
+    public void setMobilePhone(String mobilePhone) {
+        this.mobilePhone = mobilePhone;
+    }
+
+    public String getBlogNickName() {
+        return blogNickName;
+    }
+
+    public void setBlogNickName(String blogNickName) {
+        this.blogNickName = blogNickName;
+    }
+
+    public String getSexFlag() {
+        return sexFlag;
+    }
+
+    public void setSexFlag(String sexFlag) {
+        this.sexFlag = sexFlag;
+    }
+
+    public String getRegisteDate() {
+        return registeDate;
+    }
+
+    public void setRegisteDate(String registeDate) {
+        this.registeDate = registeDate;
+    }
+
+    public String getBlogToken() {
+        return blogToken;
+    }
+
+    public void setBlogToken(String blogToken) {
+        this.blogToken = blogToken;
+    }
+
+    public String getMinaToken() {
+        return minaToken;
+    }
+
+    public void setMinaToken(String minaToken) {
+        this.minaToken = minaToken;
+    }
+
+    public String getBlogProfilePhoto() {
+        return blogProfilePhoto;
+    }
+
+    public void setBlogProfilePhoto(String blogProfilePhoto) {
+        this.blogProfilePhoto = blogProfilePhoto;
+    }
+
+    public String getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(String updateDate) {
+        this.updateDate = updateDate;
+    }
+}

+ 2 - 0
YijiaRestful/src/main/java/com/platform/yijia/service/AppUserInfoService.java

@@ -9,4 +9,6 @@ public interface AppUserInfoService {
 
     //验证身份
     List<AppUserInfo> Authentication(AppUserInfo appUserInfo);
+//添加信息
+    void AddAppUserInfo(AppUserInfo appUserInfo);
 }

+ 9 - 0
YijiaRestful/src/main/java/com/platform/yijia/service/impl/AppUserInfoServiceImpl.java

@@ -27,4 +27,13 @@ public class AppUserInfoServiceImpl implements AppUserInfoService {
         List<AppUserInfo> list= appUserInfoMapper.selectByExample(example);
         return list;
     }
+
+    /**
+     * 添加用户
+     * @param appUserInfo
+     */
+    @Override
+    public void AddAppUserInfo(AppUserInfo appUserInfo) {
+        appUserInfoMapper.insert(appUserInfo);
+    }
 }