修改支付

src/main/java/com/llisoft/service/pay/controller/AliPayController.java

@@ -17,10 +17,10 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import com.llisoft.common.exception.MtaException;
 import com.llisoft.service.pay.service.AliPayService;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 
-/**
- * 支付宝
- */
+@Api(tags="支付宝回调")
 @Controller
 @RequestMapping("/alipay")
 public class AliPayController {
@@ -31,11 +31,7 @@ public class AliPayController {
 	private AliPayService aliPayService;
 	
 	
-	/**
-	 * 支付宝同步回调
-	 * @param request
-	 * @return
-	 */
+	@ApiOperation(value="同步回调")
 	@GetMapping("/return")
 	public String retur(HttpServletRequest request) {
 		Map<String, String> resultMap = this.getParamMap(request);
@@ -52,11 +48,7 @@ public class AliPayController {
 		return null;
 	}
 	
-	/**
-	 * 支付宝异步通知
-	 * @param request
-	 * @return
-	 */
+	@ApiOperation(value="异步通知")
 	@PostMapping(value="/notify")
 	public @ResponseBody String notify(HttpServletRequest request) {
 		Map<String, String> resultMap = this.getParamMap(request);

src/main/java/com/llisoft/service/pay/controller/OrderController.java

@@ -21,9 +21,10 @@ import com.llisoft.service.pay.vo.OrderInfoResponseVo;
 import com.llisoft.service.pay.vo.OrderPayRequestVo;
 import com.llisoft.service.pay.vo.OrderPayResponseVo;
 
-/**
- * 订单
- */
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+@Api(tags="支付订单")
 @RestController
 @RequestMapping("/order")
 public class OrderController{
@@ -34,27 +35,21 @@ public class OrderController{
 	private OrderService orderService;
 	
 	
-	/**
-	 * 订单添加
-	 */
+	@ApiOperation(value="订单添加")
 	@PostMapping("/add")
 	public ResponseVo<OrderAddResponseVo> add(@Valid @RequestBody OrderAddRequestVo vo) throws MtaException{
 		logger.info("收到订单添加请求: {}", JsonUtil.toJson(vo));
 		return ResponseVo.success(orderService.add(vo.getAppKey(), vo.getMoney(), vo.getTitle()));
 	}
 	
-	/**
-	 * 订单支付
-	 */
+	@ApiOperation(value="订单支付")
 	@PostMapping("/pay")
 	public ResponseVo<OrderPayResponseVo> pay(@Valid @RequestBody OrderPayRequestVo vo) throws MtaException{
 		logger.info("收到订单支付请求: {}", JsonUtil.toJson(vo));
 		return ResponseVo.success(orderService.pay(vo.getOrderNum(), vo.getPayType(), vo.isMobile()));
 	}
 	
-	/**
-	 * 订单信息
-	 */
+	@ApiOperation(value="订单详情")
 	@PostMapping("/info")
 	public ResponseVo<OrderInfoResponseVo> get(@Valid @RequestBody OrderInfoRequestVo vo) throws MtaException{
 		logger.info("收到订单详情请求: {}", JsonUtil.toJson(vo));

src/main/java/com/llisoft/service/pay/controller/WxPayController.java

@@ -0,0 +1,61 @@
+package com.llisoft.service.pay.controller;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+@Api(tags="微信支付回调")
+@Controller
+@RequestMapping("/wxpay")
+public class WxPayController {
+	
+	private Logger logger = LoggerFactory.getLogger(WxPayController.class);
+	
+
+	@ApiOperation(value="同步回调")
+	@GetMapping("/return")
+	public String retur(HttpServletRequest request) {
+		Map<String, String> resultMap = this.getParamMap(request);
+		logger.info("收到微信同步回调: {}", resultMap);
+		return null;
+	}
+	
+	@ApiOperation(value="异步通知")
+	@PostMapping(value="/notify")
+	public @ResponseBody String notify(HttpServletRequest request) {
+		Map<String, String> resultMap = this.getParamMap(request);
+		logger.info("收到微信异步通知: {}", resultMap);
+		return null;
+	}
+	
+	
+	/**
+	 * 获取参数Map<String, String>
+	 * @param request
+	 * @return
+	 */
+	private Map<String, String> getParamMap(HttpServletRequest request){
+		Map<String, String> returnMap = new HashMap<String, String>();
+		Map<String, String[]> paramMap = request.getParameterMap();
+		for (String key: paramMap.keySet()) {
+			String[] values = paramMap.get(key);
+			if (values!=null && values.length>0) {
+				returnMap.put(key, values[0]);
+			}
+		}
+		return returnMap;
+	}
+
+}

src/main/java/com/llisoft/service/pay/dao/ItemDao.java

@@ -12,11 +12,11 @@ import com.llisoft.service.pay.entity.Item;
 @Mapper
 public interface ItemDao {
 
-	@Select("select * from mta_pay_item where item_id=#{itemId}")
+	@Select("select * from mta_pay_item where pay_id=#{payId}")
 	Item select(int payId);
 	
-	@Select("select * from mta_pay_item where item_num=#{itemNum}")
-	Item selectByPayNum(String itemNum);
+	@Select("select * from mta_pay_item where pay_num=#{payNum}")
+	Item selectByPayNum(String payNum);
 	
     @Insert("insert into mta_pay_item (pay_id,pay_num,pay_status,pay_type,order_id,create_time) "
     		+ "values (#{payId},#{payNum},#{payStatus},#{payType},#{orderId},now())")

src/main/java/com/llisoft/service/pay/entity/App.java

@@ -10,7 +10,7 @@ public class App {
     /**
      * ID
      */
-    private Integer appId;
+    private int appId;
 
     /**
      * 业务唯一标识
@@ -47,11 +47,11 @@ public class App {
      */
     private Date updateTime;
 
-    public Integer getAppId() {
+    public int getAppId() {
         return appId;
     }
 
-    public void setAppId(Integer appId) {
+    public void setAppId(int appId) {
         this.appId = appId;
     }
 

src/main/java/com/llisoft/service/pay/entity/Item.java

@@ -10,7 +10,7 @@ public class Item {
     /**
      * ID
      */
-    private Integer payId;
+    private int payId;
 
     /**
      * 支付号
@@ -40,7 +40,7 @@ public class Item {
     /**
      * 订单ID
      */
-    private Integer orderId;
+    private int orderId;
 
     /**
      * 支付时间
@@ -57,11 +57,11 @@ public class Item {
      */
     private Date updateTime;
 
-    public Integer getPayId() {
+    public int getPayId() {
         return payId;
     }
 
-    public void setPayId(Integer payId) {
+    public void setPayId(int payId) {
         this.payId = payId;
     }
 
@@ -105,11 +105,11 @@ public class Item {
         this.tradeNum = tradeNum;
     }
 
-    public Integer getOrderId() {
+    public int getOrderId() {
         return orderId;
     }
 
-    public void setOrderId(Integer orderId) {
+    public void setOrderId(int orderId) {
         this.orderId = orderId;
     }
 

src/main/java/com/llisoft/service/pay/entity/Order.java

@@ -10,7 +10,7 @@ public class Order {
     /**
      * ID
      */
-    private Integer orderId;
+    private int orderId;
 
     /**
      * 订单号
@@ -25,7 +25,7 @@ public class Order {
     /**
      * 订单金额(分)
      */
-    private Integer orderMoney;
+    private int orderMoney;
 
     /**
      * 订单标题
@@ -35,7 +35,7 @@ public class Order {
     /**
      * 业务ID
      */
-    private Integer appId;
+    private int appId;
 
     /**
      * 支付时间
@@ -52,11 +52,11 @@ public class Order {
      */
     private Date updateTime;
 
-    public Integer getOrderId() {
+    public int getOrderId() {
         return orderId;
     }
 
-    public void setOrderId(Integer orderId) {
+    public void setOrderId(int orderId) {
         this.orderId = orderId;
     }
 
@@ -76,11 +76,11 @@ public class Order {
         this.orderStatus = orderStatus;
     }
 
-    public Integer getOrderMoney() {
+    public int getOrderMoney() {
         return orderMoney;
     }
 
-    public void setOrderMoney(Integer orderMoney) {
+    public void setOrderMoney(int orderMoney) {
         this.orderMoney = orderMoney;
     }
 
@@ -92,11 +92,11 @@ public class Order {
         this.orderTitle = orderTitle;
     }
 
-    public Integer getAppId() {
+    public int getAppId() {
         return appId;
     }
 
-    public void setAppId(Integer appId) {
+    public void setAppId(int appId) {
         this.appId = appId;
     }
 

src/main/java/com/llisoft/service/pay/service/PayService.java

@@ -68,7 +68,7 @@ public class PayService {
 	 * @return 返回支付跳转地址
 	 */
 	public String add(int orderId, byte payType){
-		String payNum = String.valueOf(System.currentTimeMillis() + RandomUtil.getRandomInt(5));
+		String payNum = String.valueOf(System.currentTimeMillis()) + RandomUtil.getRandomInt(5);
 		Item pay = new Item();
 		pay.setPayNum(payNum);
 		pay.setPayType(payType);

src/main/resources/application.yml

@@ -1,27 +1,17 @@
 ##服务配置
 server:
-  port: 8001 #监听端口
+  port: 8002 #监听端口
   
 ##自定义配置
 mta: 
   debug: true #是否测试
-  domain: http://localhost:8080  #本工程域名(用于支付回调)
+  domain: http://localhost  #本工程域名(用于支付回调 需要在支付宝开放平台配置)
   ali: #支付宝
     appid: 2016080300154811
     serverUrl: https://openapi.alipaydev.com/gateway.do
     publicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuHV05fB6aafE1lMvFtU/eawP0s4uFa2zZThPFGx80l1JZNWaMfQoa8+Gu8reRc/PRnx1N9syTc/zeZYZUfstPn22y8qWPLYwqxyJH53knCj9263M8P6Q4n+MF7pUVUQbkn0FTlyo8eWZlpCOJe9MDTTIhPdIMlrDn31HiFZ8TY0pySh5tEZzhYIaaJjmvQUdQuCWMwdq9uzVtHu++QFmbHCApZbekJcQ1ebaGv76DOiGpPPtlH3mrSGqR/1z0uVwC5iRn5vuax/73a/OPvQGHOVTBq2QBiZHRf23DPO7SMuCpampEVaXIwIW2weCfNnvLCWMQ+v0dxpOVIUx1BlLjwIDAQAB
     privateKey: MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCZ2eFSd0f+SC3Djep7v3PwNludUmrPaiJNf6Wf3+5XVIVQGeomsFCIF1qS3hecj6x9k/JEayxQTDjMnwADZLMUcqsMm/OuOa+36kzSg/yFTs2Jq23GjjsHI6/g4ioj9inl9t4QfimBN6RczGzLWBUe1trhmNICFVJqbPomUgz19ey8uCaMbttIaHi8yNLTflFEHysl9LZSmNNBlz50MtLhIc77/UKbah2ot3xllHnVnvz0jXVTdMqIP//H4Oitcucy018EcMctgvdmFNG5VIste6yOmd+uox82QyFRRAngmw+66EpYHzmbwKpGHD0KKi/35ti4IGA+uoXxY50Xcm+tAgMBAAECggEACxvMRSQPsrCLfV812xGL0YBbRRS6WZeUOnxI/S4yC2Qy7AGzAnAgoHLvO0OF+Ov2zGpuR7plTLb0MvIYEianN4bACv0Hr0DDC0iDm3+kMAvsk1ApcPi8ElvlSxuJZ2dSxyP4DMDPRmE6IOkxwczuWXex/jAGmdfoR37u4O1zuh6Wu+JpKbYfTiwmhw0OAJBq1gm1wiTN9thDr1Qf4Ifr/k0Mv9TVnOWQLAg9qGGfQHEU/UtU92Rlp4S2WB2UMl8gpq0ZgC7brxeegS7OW2uv8LtTrdekhVzC62zyE+V47xQ1hukAv06Sw9+XgjI0fLHS3xxNCUOVWqwiOnhluJjHgQKBgQDinyhksk7pHKra9ryy03hGTPZt2LYGNCogfdIuG8ShNrXva6MV4TuGcgjcJUNed+w3QW/F9C/kRUP7VQvEL/j/1lfKy4FRWvui7Mr9LyouaTlANXyVc0KzoS3u3NIy5eKTOE0QrUNs7G4x16R84Gsx3GQOGUhmFi+WPhQ0SqkiiQKBgQCty7NoCjQ7g6DMIE7vcGuRAACAEZi0P9qLZvHmwujdJlyPctYX2/wcpT1bnn1FqyavSDKNrtSIIfa5GNCUzcv4ysBiYZlXNGDw4wleQ/ENG/DRj0A4AAOR3/bR5TaAY9QnFInuj2mlKvmQWuYvc6EnLDfo1OjuWc0bDkWpO6nrBQKBgQCzJ6OlR5k+jJ09kUXIEYnJ+dnvKR1tdhu/p/ha3zTpRfk6l1tMVszaEpiSgRrrOd8SJ7cXRV3/FgsSTD+LD2nHx0mMVqmbCVRZjt1CnuC35BOQgThGZeJbY5aOeR/rgPVH8YBrKK5fE+JhoNq2pivYNSUcSDyGCBACtH0Age2IEQKBgQCQMg1VSfoSUuDL3BaB9O1abfz8RR1EmCIUPUKBKsAYFKcBYc8eFqgzgCnLZVEcx6ceETHYefDeTgethVgxzhno/xflyIJ4Zv3zfvub2ZUbQk5pIIiwrdpIYuEfPyUcGze/gPv8EcMehexwB+sp/a78mGR+6n+kmp9hTlMf2V/enQKBgQDPH5exzUjktHYwlEhEsXOGCUh1gs7KI5d7FcWWubZiWgz3I2F4iVMW9yd1godxr0XUJMuWJqft0c0A/ayPDOCRwxvnxMDEB9qhA4hdfyBdUYKU4sDxn8NmT7/srMbSUyQIzbprA6UPg4Hh68nunvMwf/vX8VK4641y+W3rYYyDjw==
   
-  
-##oss配置
-oss: 
-  url: http://yangjie-test.oss-cn-beijing.aliyuncs.com
-  bucket: yangjie-test
-  endpoint: http://oss-cn-beijing.aliyuncs.com
-  accessKeyId: LTAIbMS7HApX1Vz7
-  accessKeySecret: f1ro3QyunFsyElXfjCAJWtPozdCjNu
-    
-
 ##spring配置
 spring: 
   ##应用配置 #服务名称
@@ -46,6 +36,11 @@ spring:
     removeAbandoned: true           ##是否进行无用链接回收, 默认: false
     removeAbandonedTimeout: 60    ##链接有效期,超时将被回收(秒), 默认: 60
     
+#mybatis配置
+mybatis: 
+  configuration: 
+    mapUnderscoreToCamelCase: true ## 开启自动驼峰命名规则映射
+    
 ##注册中心配置
 eureka:
   instance: 
@@ -58,7 +53,7 @@ eureka:
 
 ##监控配置    
 management:
-  server.port: 18001 #监控端口
+  server.port: 18002 #监控端口
   endpoints.web.exposure.include: "*" #开启所有端点
   endpoint.health.show-details: always #显示健康详情