汇付支付修改

mec-biz/src/main/java/com/ym/mec/biz/service/NotifyCallback.java

@@ -6,7 +6,7 @@ import com.huifu.adapay.notify.MQTTCallbackHandler;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import com.ym.mec.biz.dal.entity.TenantPaymentOrder;
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
-import com.ym.mec.thirdparty.adapay2.ConfigInit;
+import com.ym.mec.thirdparty.adapay.ConfigInit;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/PayServiceImpl.java

@@ -9,7 +9,7 @@ import com.ym.mec.biz.service.PayService;
 import com.ym.mec.biz.service.StudentPaymentOrderService;
 import com.ym.mec.biz.service.SysAccountService;
 import com.ym.mec.biz.service.SysPaymentConfigService;
-import com.ym.mec.thirdparty.adapay2.Payment;
+import com.ym.mec.thirdparty.adapay.Payment;
 import com.ym.mec.thirdparty.union.UnionPay;
 import com.ym.mec.thirdparty.union.UnionPayFeignService;
 import com.ym.mec.thirdparty.yqpay.YqPayUtil;

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentOrderServiceImpl.java

@@ -15,7 +15,7 @@ import com.ym.mec.biz.service.*;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
-import com.ym.mec.thirdparty.adapay2.Payment;
+import com.ym.mec.thirdparty.adapay.Payment;
 import com.ym.mec.thirdparty.yqpay.Msg;
 import com.ym.mec.thirdparty.yqpay.RsqMsg;
 import com.ym.mec.thirdparty.yqpay.YqPayFeignService;

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantPaymentOrderServiceImpl.java

@@ -10,8 +10,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
-import com.ym.mec.thirdparty.adapay2.Payment;
+import com.ym.mec.thirdparty.adapay.Payment;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

mec-student/src/main/java/com/ym/mec/student/StudentApplication.java

@@ -4,7 +4,7 @@ import javax.servlet.Filter;
 
 import com.huifu.adapay.Adapay;
 import com.huifu.adapay.model.MerConfig;
-import com.ym.mec.thirdparty.adapay2.ConfigInit;
+import com.ym.mec.thirdparty.adapay.ConfigInit;
 import com.ym.mec.biz.service.NotifyCallback;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;

mec-student/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -1,12 +1,11 @@
 package com.ym.mec.student.controller;
 
-import com.alibaba.fastjson.JSONObject;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.OrderTypeEnum;
 import com.ym.mec.biz.service.*;
-import com.ym.mec.thirdparty.adapay2.ConfigInit;
-import com.ym.mec.thirdparty.adapay2.Payment;
+import com.ym.mec.thirdparty.adapay.ConfigInit;
+import com.ym.mec.thirdparty.adapay.Payment;
 import com.ym.mec.util.date.DateUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -26,7 +25,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.connection.RedisServer;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -45,7 +43,6 @@ import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
-import com.ym.mec.thirdparty.adapay.NotifyEvent;
 import com.ym.mec.thirdparty.yqpay.Msg;
 import com.ym.mec.thirdparty.yqpay.RsqMsg;
 import com.ym.mec.thirdparty.yqpay.YqPayFeignService;
@@ -237,32 +234,6 @@ public class StudentOrderController extends BaseController {
         return succeed(payment);
     }
 
-    @PostMapping("/adaNotify")
-    public void adaNotify(@ModelAttribute NotifyEvent notifyEvent) throws Exception {
-        logger.info(notifyEvent.toString());
-        System.out.println("查看");
-        //[data={"app_id":"app_f0ebdd29-046f-4b60-bd50-92e2c1285c02","created_time":"20200629144014","end_time":"20200629144025","expend":{},"id":"002112020062914401310123566451963129856","order_no":"20062914394700001","out_trans_id":"2020062922001436811416495773","party_order_id":"02212006295281400400681","pay_amt":"0.01","pay_channel":"alipay_qr","status":"succeeded"}]
-
-        if (!notifyEvent.getType().equals("payment.succeeded") && !notifyEvent.getType().equals("payment.failed")) {
-            return;
-        }
-        String data = notifyEvent.getData();
-
-        JSONObject dataObj = JSON.parseObject(notifyEvent.getData());
-        if (!dataObj.getString("app_id").equals(ConfigInit.appId)) {
-            return;
-        }
-
-        Map<String, String> notifyMap = new HashMap<>();
-        //支付中订单存在，更新状态
-        String tradeState = notifyEvent.getType().equals("payment.succeeded") ? "1" : "0";
-        notifyMap.put("channelType", dataObj.getString("pay_channel"));
-        notifyMap.put("tradeState", tradeState);
-        notifyMap.put("totalMoney", dataObj.getString("pay_amt"));
-        notifyMap.put("merOrderNo", dataObj.getString("order_no"));
-        studentPaymentOrderService.updateOrder(notifyMap);
-    }
-
     @GetMapping("/authorize")
     public String authorize(@RequestParam("returnUrl") String returnUrl) {
         String appId = "wxcf8e8b33a9477845";

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherOrderController.java

@@ -1,7 +1,6 @@
 package com.ym.mec.teacher.controller;
 
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -11,14 +10,12 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 
 import javax.servlet.http.HttpServletResponse;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -26,14 +23,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson.JSON;
-import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.SysConfigDao;
 import com.ym.mec.biz.dal.dao.TenantPaymentOrderDao;
 import com.ym.mec.biz.dal.entity.TenantPaymentOrder;
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import com.ym.mec.biz.service.TenantPaymentOrderService;
 import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.thirdparty.adapay.NotifyEvent;
 import com.ym.mec.thirdparty.yqpay.Msg;
 import com.ym.mec.thirdparty.yqpay.YqPayFeignService;
 
@@ -97,43 +92,6 @@ public class TeacherOrderController extends BaseController {
 		return msg;
 	}
 
-	@PostMapping("/adaNotify")
-	public void adaNotify(@ModelAttribute NotifyEvent notifyEvent) throws Exception {
-		logger.info(notifyEvent.toString());
-		if (notifyEvent.getType().equals("payment.success") && notifyEvent.getType().equals("payment.failed")) {
-			return;
-		}
-
-		Map<String, String> notifyMap = JSON.parseObject(notifyEvent.getData(), Map.class);
-
-		// 支付中订单存在，更新状态
-		if (notifyMap.size() > 0) {
-			String tradeState = notifyEvent.getType().equals("payment.success") ? "1" : "0";
-			notifyMap.put("tradeState", tradeState);
-			notifyMap.put("totalMoney", notifyMap.get("pay_amt"));
-			notifyMap.put("merOrderNo", notifyMap.get("order_no"));
-			notifyMap.put("merOrderNo", notifyMap.get("order_no"));
-			notifyMap.put("remarks", notifyMap.get("description"));
-
-			DealStatusEnum status = tradeState.equals("1") ? DealStatusEnum.SUCCESS : DealStatusEnum.FAILED;
-			TenantPaymentOrder order = tenantPaymentOrderDao.findOrderByOrderNo(notifyMap.get("merMerOrderNo"));
-			if (order == null || !order.getStatus().equals(DealStatusEnum.ING)) {
-				return;
-			}
-
-			if (status.equals(DealStatusEnum.SUCCESS)) {
-				order.setPayTime(new Date());
-			} else {
-				order.setMemo(notifyMap.get("remarks"));
-			}
-			order.setStatus(status);
-			order.setTransNo(notifyMap.get("orderNo"));
-			order.setPaymentBusinessChannel(notifyMap.get("channelType"));
-			order.setActualAmount(new BigDecimal(notifyMap.get("payAmount")));
-			tenantPaymentOrderService.paymentForCallback(order);
-		}
-	}
-
 	@GetMapping("/setSuccessStatus")
 	public void setSuccessStatus() throws Exception {
 		List<TenantPaymentOrder> payingOrders = tenantPaymentOrderDao.findOrdersByStatus(DealStatusEnum.ING, "YQPAY");

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/adapay2/AdapayTools.java → mec-thirdparty/src/main/java/com/ym/mec/thirdparty/adapay/AdapayTools.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.adapay2;
+package com.ym.mec.thirdparty.adapay;
 
 import java.util.HashMap;
 import java.util.Map;

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/adapay2/Bill.java → mec-thirdparty/src/main/java/com/ym/mec/thirdparty/adapay/Bill.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.adapay2;
+package com.ym.mec.thirdparty.adapay;
 
 import java.util.HashMap;
 import java.util.Map;

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/adapay2/ConfigInit.java → mec-thirdparty/src/main/java/com/ym/mec/thirdparty/adapay/ConfigInit.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.adapay2;
+package com.ym.mec.thirdparty.adapay;
 
 import com.huifu.adapay.Adapay;
 import com.huifu.adapay.model.MerConfig;

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/adapay2/CorpMember.java → mec-thirdparty/src/main/java/com/ym/mec/thirdparty/adapay/CorpMember.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.adapay2;
+package com.ym.mec.thirdparty.adapay;
 
 import java.io.File;
 import java.util.HashMap;

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/adapay2/MainDemo.java → mec-thirdparty/src/main/java/com/ym/mec/thirdparty/adapay/MainDemo.java

@@ -1,9 +1,5 @@
-package com.ym.mec.thirdparty.adapay2;
+package com.ym.mec.thirdparty.adapay;
 
-import com.huifu.adapay.Adapay;
-import com.huifu.adapay.model.MerConfig;
-
-import java.util.HashMap;
 import java.util.Map;
 
 /**

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/adapay2/Member.java → mec-thirdparty/src/main/java/com/ym/mec/thirdparty/adapay/Member.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.adapay2;
+package com.ym.mec.thirdparty.adapay;
 
 import java.util.HashMap;
 import java.util.Map;

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/adapay/NotifyEvent.java

@@ -1,56 +0,0 @@
-package com.ym.mec.thirdparty.adapay;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-public class NotifyEvent {
-    private String id;
-    private String type;
-    private String created_time;
-    private String prod_mode;
-    private String data;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getCreated_time() {
-        return created_time;
-    }
-
-    public void setCreated_time(String created_time) {
-        this.created_time = created_time;
-    }
-
-    public String getProd_mode() {
-        return prod_mode;
-    }
-
-    public void setProd_mode(String prod_mode) {
-        this.prod_mode = prod_mode;
-    }
-
-    public String getData() {
-        return data;
-    }
-
-    public void setData(String data) {
-        this.data = data;
-    }
-
-    @Override
-    public String toString() {
-        return ToStringBuilder.reflectionToString(this);
-    }
-}

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/adapay2/Payment.java → mec-thirdparty/src/main/java/com/ym/mec/thirdparty/adapay/Payment.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.adapay2;
+package com.ym.mec.thirdparty.adapay;
 
 import java.math.BigDecimal;
 import java.util.*;

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/adapay2/Refund.java → mec-thirdparty/src/main/java/com/ym/mec/thirdparty/adapay/Refund.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.adapay2;
+package com.ym.mec.thirdparty.adapay;
 
 import java.util.HashMap;
 import java.util.Map;

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/adapay2/SettleAccount.java → mec-thirdparty/src/main/java/com/ym/mec/thirdparty/adapay/SettleAccount.java

@@ -1,4 +1,4 @@
-package com.ym.mec.thirdparty.adapay2;
+package com.ym.mec.thirdparty.adapay;
 
 import java.util.HashMap;
 import java.util.Map;