feats

src/main/java/com/yunzhi/niucai/common/CommConstants.java

@@ -51,4 +51,9 @@ public class CommConstants {
      * 支付成功
      */
     public final static String TRADE_STATUS_SUCCESS = "TRADE_SUCCESS";
+
+    /**
+     * 支付成功
+     */
+    public final static String WX_TRADE_STATUS_SUCCESS = "SUCCESS";
 }

src/main/java/com/yunzhi/niucai/controller/TaWxpayController.java

@@ -1,24 +1,21 @@
 package com.yunzhi.niucai.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.binarywang.wxpay.exception.WxPayException;
 import com.yunzhi.niucai.common.BaseController;
 import com.yunzhi.niucai.common.ResponseBean;
+import com.yunzhi.niucai.entity.TaOrder;
+import com.yunzhi.niucai.service.ITaWxpayService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import com.yunzhi.niucai.service.ITaWxpayService;
-import com.yunzhi.niucai.entity.TaWxpay;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
 
 /**
  * <p>
@@ -39,81 +36,26 @@ public class TaWxpayController extends BaseController {
     @Autowired
     public ITaWxpayService iTaWxpayService;
 
-
-    /**
-     * 分页查询列表
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @RequestMapping(value="/taWxpay",method= RequestMethod.GET)
-    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taWxpayList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
-
-		    IPage<TaWxpay> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaWxpay> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
-
-            IPage<TaWxpay> result = iTaWxpayService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
-    }
-
     /**
-     * 保存对象
-     * @param taWxpay 实体对象
+     * 手机app获取唤醒支付宝的参数
+     * @param request
+     * @param taOrder
      * @return
+     * @throws Exception
      */
-    @RequestMapping(value="/taWxpay",method= RequestMethod.POST)
-    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean taWxpayAdd(@ApiParam("保存内容") @RequestBody TaWxpay taWxpay) throws Exception{
-
-        if (iTaWxpayService.save(taWxpay)){
-            return ResponseBean.success(taWxpay);
-        }else {
-            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
-
-    /**
-     * 根据id删除对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/taWxpay/{id}", method= RequestMethod.DELETE)
-    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taWxpayDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaWxpayService.removeById(id)){
-            return ResponseBean.success("success");
-        }else {
-            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
-
-    /**
-     * 修改对象
-     * @param id  实体ID
-     * @param taWxpay 实体对象
-     * @return
-     */
-    @RequestMapping(value="/taWxpay/{id}",method= RequestMethod.PUT)
-    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taWxpayUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody TaWxpay taWxpay) throws Exception{
-
-        if (iTaWxpayService.updateById(taWxpay)){
-            return ResponseBean.success(iTaWxpayService.getById(id));
-        }else {
-            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
+    @PostMapping("/app/wxpay/order")
+    @ApiOperation(value = "创建订单", notes = "创建订单", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean create(HttpServletRequest request,@ApiParam("下单记录") @RequestBody TaOrder taOrder) throws Exception {
+        return iTaWxpayService.orderPaying(taOrder,request.getRemoteAddr(),request.getHeader("user-agent"));
     }
 
     /**
-     * 根据id查询对象
-     * @param id  实体ID
+     * 支付成功回调
+     * @param request
      */
-    @RequestMapping(value="/taWxpay/{id}",method= RequestMethod.GET)
-    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taWxpayGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTaWxpayService.getById(id));
+    @GetMapping("/app/callback/wxpay/pay")
+    public String callback(HttpServletRequest request) throws IOException, WxPayException {
+        String xmlResult = IOUtils.toString(request.getInputStream(), request.getCharacterEncoding());
+        return iTaWxpayService.payCallback(xmlResult);
     }
 }

src/main/java/com/yunzhi/niucai/entity/TaOrder.java

@@ -1,8 +1,8 @@
 package com.yunzhi.niucai.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDateTime;
 
+import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
@@ -14,6 +14,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+
 /**
  * <p>
  * 订单主表 
@@ -55,9 +56,12 @@ public class TaOrder implements Serializable {
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createDate;
 
-    @ApiModelProperty(value = "状态 1已支付,3支付中，0未支付")
+    @ApiModelProperty(value = "状态")
     private Integer status;
 
+    @ApiModelProperty(value = "支付状态 1已支付,3支付中，0未支付")
+    private Integer payStatus;
+
     @ApiModelProperty(value = "商户网站唯一订单号")
     private String outTradeNo;
 

src/main/java/com/yunzhi/niucai/entity/TaShopApp.java

@@ -2,14 +2,15 @@ package com.yunzhi.niucai.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 门店应用表 
@@ -54,9 +55,12 @@ public class TaShopApp implements Serializable {
     @ApiModelProperty(value = "支付宝应用刷新token最后使用时间")
     private LocalDateTime updateTokenDate;
 
-    @ApiModelProperty(value = "对应的alipay应用")
+    @ApiModelProperty(value = "支付宝主键id")
     private String alipayId;
 
     @ApiModelProperty(value = "Token 有效期, 单位秒")
     private String expiresIn;
+
+    @ApiModelProperty(value = "微信子商户id")
+    private String subMchId;
 }

src/main/java/com/yunzhi/niucai/entity/TaWxpay.java

@@ -2,11 +2,12 @@ package com.yunzhi.niucai.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 微信商户应用信息 
@@ -38,5 +39,8 @@ public class TaWxpay implements Serializable {
      */
     private String mchId;
 
-
+    /**
+     * 回调地址
+     */
+    private String notifyUrl;
 }

src/main/java/com/yunzhi/niucai/service/ITaWxpayService.java

@@ -1,5 +1,8 @@
 package com.yunzhi.niucai.service;
 
+import com.github.binarywang.wxpay.exception.WxPayException;
+import com.yunzhi.niucai.common.ResponseBean;
+import com.yunzhi.niucai.entity.TaOrder;
 import com.yunzhi.niucai.entity.TaWxpay;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,4 +16,13 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaWxpayService extends IService<TaWxpay> {
 
+    /**
+     * 微信支付H5下单操作
+     * @param taOrder
+     * @param remoteAddr
+     * @return
+     */
+    ResponseBean orderPaying(TaOrder taOrder, String remoteAddr, String agent) throws WxPayException;
+
+    String payCallback(String xmlResult) throws WxPayException;
 }

src/main/java/com/yunzhi/niucai/service/impl/TaAlipayServiceImpl.java

@@ -74,7 +74,7 @@ public class TaAlipayServiceImpl extends ServiceImpl<TaAlipayMapper, TaAlipay> i
         }
 
         taOrder.setOutTradeNo(outTradeNo);
-        taOrder.setStatus(CommConstants.SRTATUS_PAYING);
+        taOrder.setPayStatus(CommConstants.SRTATUS_PAYING);
         return taOrderService.updateById(taOrder);
     }
 
@@ -90,12 +90,12 @@ public class TaAlipayServiceImpl extends ServiceImpl<TaAlipayMapper, TaAlipay> i
         taOrder.setUpdateDate(LocalDateTime.now());
         // 支付失败
         if (!tradeStatus.equals(CommConstants.TRADE_STATUS_SUCCESS)){
-            taOrder.setStatus(CommConstants.SRTATUS_UNPAYED);
+            taOrder.setPayStatus(CommConstants.SRTATUS_UNPAYED);
             taOrderService.updateById(taOrder);
             return;
         }
         //支付成功 更新为已支付状态
-        taOrder.setStatus(CommConstants.SRTATUS_EFFECTIVE);
+        taOrder.setPayStatus(CommConstants.SRTATUS_EFFECTIVE);
         taOrder.setTradeNo(tradeNo);
         taOrderService.updateById(taOrder);
     }

src/main/java/com/yunzhi/niucai/service/impl/TaWxpayServiceImpl.java

@@ -1,11 +1,28 @@
 package com.yunzhi.niucai.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse;
+import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
+import com.github.binarywang.wxpay.bean.order.WxPayMwebOrderResult;
+import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
+import com.github.binarywang.wxpay.exception.WxPayException;
+import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl;
+import com.yunzhi.niucai.common.CommConstants;
+import com.yunzhi.niucai.common.ResponseBean;
+import com.yunzhi.niucai.entity.TaOrder;
 import com.yunzhi.niucai.entity.TaWxpay;
 import com.yunzhi.niucai.mapper.TaWxpayMapper;
+import com.yunzhi.niucai.service.ITaOrderService;
 import com.yunzhi.niucai.service.ITaWxpayService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.niucai.wxPay.WxpayFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigInteger;
+import java.security.SecureRandom;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 微信商户应用信息  服务实现类
@@ -17,4 +34,73 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaWxpayServiceImpl extends ServiceImpl<TaWxpayMapper, TaWxpay> implements ITaWxpayService {
 
+    @Autowired
+    private WxpayFactory wxpayFactory;
+    @Autowired
+    private ITaOrderService taOrderService;
+
+    /**
+     * 微信支付H5下单操作
+     *
+     * @param taOrder
+     * @param remoteAddr
+     * @return
+     */
+    @Override
+    public ResponseBean orderPaying(TaOrder taOrder, String remoteAddr, String agent) throws WxPayException {
+        // 获取微信支付服务
+        WxPayServiceImpl wxPayService = wxpayFactory.getService(taOrder.getShopId());
+        // 下单
+        String outTradeNo = taOrder.getOrderId() + "-" + randomString(3);
+        String subject = "微信支付";
+        WxPayUnifiedOrderRequest orderRequest = new WxPayUnifiedOrderRequest();
+        orderRequest.setBody(subject);
+        orderRequest.setOutTradeNo(outTradeNo);
+        orderRequest.setTotalFee(taOrder.getCharge());//元转成分
+        orderRequest.setOpenid("openId");
+        orderRequest.setSpbillCreateIp(remoteAddr);
+        orderRequest.setTradeType("MWEB");
+        String type = agent.contains("iPhone")||agent.contains("iPod")||agent.contains("iPad") ? "IOS" : "Android";
+        orderRequest.setSceneInfo("{\"h5_info\": {\"type\":\""+type+"\",\"app_name\": \"牛彩\",\"bundle_id\": \"com.tencent.wzryIOS\"}}");
+        WxPayMwebOrderResult result = wxPayService.createOrder(orderRequest);
+
+        // 更新状态
+        taOrder.setOutTradeNo(outTradeNo);
+        taOrder.setPayStatus(CommConstants.SRTATUS_PAYING);
+        taOrderService.updateById(taOrder);
+        return ResponseBean.success(result);
+    }
+
+    @Override
+    public String payCallback(String xmlResult) throws WxPayException {
+        // 获取微信支付服务
+        WxPayOrderNotifyResult result = WxPayOrderNotifyResult.fromXML(xmlResult);
+
+        // 加入自己处理订单的业务逻辑，需要判断订单是否已经支付过，否则可能会重复调用
+        String outTradeNo = result.getOutTradeNo();
+        String tradeNo = result.getTransactionId();
+        TaOrder taOrder = taOrderService.getOne(new QueryWrapper<TaOrder>().eq("out_trade_no", outTradeNo));
+        taOrder.setUpdateDate(LocalDateTime.now());
+        // 支付失败
+        if (!result.getResultCode().equals(CommConstants.WX_TRADE_STATUS_SUCCESS)){
+            taOrder.setPayStatus(CommConstants.SRTATUS_UNPAYED);
+            taOrderService.updateById(taOrder);
+            return WxPayNotifyResponse.success("处理成功");
+        }
+        //支付成功 更新为已支付状态
+        taOrder.setPayStatus(CommConstants.SRTATUS_EFFECTIVE);
+        taOrder.setTradeNo(tradeNo);
+        taOrderService.updateById(taOrder);
+        return WxPayNotifyResponse.success("处理成功!");
+    }
+
+    /**
+     * 生成随机数
+     * @param length
+     * @return
+     */
+    public String randomString(int length) {
+        String str = new BigInteger(130, new SecureRandom()).toString(32);
+        return str.substring(0, length);
+    }
 }

src/main/java/com/yunzhi/niucai/wxPay/WxpayFactory.java

@@ -0,0 +1,36 @@
+package com.yunzhi.niucai.wxPay;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.binarywang.wxpay.config.WxPayConfig;
+import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl;
+import com.yunzhi.niucai.entity.TaShopApp;
+import com.yunzhi.niucai.entity.TaWxpay;
+import com.yunzhi.niucai.service.ITaShopAppService;
+import com.yunzhi.niucai.service.ITaWxpayService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class WxpayFactory {
+
+    @Autowired
+    ITaShopAppService iTaShopAppService;
+
+    @Autowired
+    ITaWxpayService iTaWxpayService;
+
+    public WxPayServiceImpl getService(Integer shopId) {
+        // 写死, 取第一个
+        TaWxpay wxpay = iTaWxpayService.getById(1);
+        // 获取子商户号
+        TaShopApp shopApp = iTaShopAppService.getOne(new QueryWrapper<TaShopApp>().eq("shop_id", shopId));
+        final WxPayServiceImpl wxPayService = new WxPayServiceImpl();
+        WxPayConfig payConfig = new WxPayConfig();
+        payConfig.setAppId(StringUtils.trimToNull(wxpay.getAppid()));
+        payConfig.setMchId(StringUtils.trimToNull(wxpay.getMchId()));
+        payConfig.setSubMchId(StringUtils.trimToNull(shopApp.getSubMchId()));
+        wxPayService.setConfig(payConfig);
+        return wxPayService;
+    }
+}