新增注释

carbon-h5/carbon-h5-common/src/main/java/com/hcloud/microserver/h5/facade/carbon/entity/GoodsOrderInfo.java

@@ -1,146 +1,43 @@
 package com.hcloud.microserver.h5.facade.carbon.entity;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
+@Api("订单详情")
+@Data
 public class GoodsOrderInfo {
+    @ApiModelProperty("序列")
     private String guid;
-
+    @ApiModelProperty("用户id")
     private String fkCustomerGuid;
-
+    @ApiModelProperty("订单编号")
     private String orderNo;
-
+    @ApiModelProperty("客户名称")
     private String customerName;
-
+    @ApiModelProperty("客户类型")
     private String customerType;
-
+    @ApiModelProperty("订单金额")
     private BigDecimal orderAmount;
-
+    @ApiModelProperty("订单购碳量")
     private BigDecimal orderCarbonAmount;
-
+    @ApiModelProperty("订单状态 1.未付款. 2.已完成（线上线下订单都完全完成了）3.未审核,4.后台审核等待打款, 5.已经打款等待再次审核")
     private Integer orderStatus;
-
+    @ApiModelProperty("记录状态 0无效 1有效")
     private Integer state;
-
+    @ApiModelProperty("创建人")
     private String createUser;
-
+    @ApiModelProperty("创建时间")
     private Date createTime;
-
+    @ApiModelProperty("修改人")
     private String modifiedUser;
-
+    @ApiModelProperty("修改时间")
     private Date modifiedTime;
-
+    @ApiModelProperty("支付流水号（成功支付后的回填，初始是空值）")
     private String payNo;
-
-    public String getGuid() {
-        return guid;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid == null ? null : guid.trim();
-    }
-
-    public String getFkCustomerGuid() {
-        return fkCustomerGuid;
-    }
-
-    public void setFkCustomerGuid(String fkCustomerGuid) {
-        this.fkCustomerGuid = fkCustomerGuid == null ? null : fkCustomerGuid.trim();
-    }
-
-    public String getOrderNo() {
-        return orderNo;
-    }
-
-    public void setOrderNo(String orderNo) {
-        this.orderNo = orderNo == null ? null : orderNo.trim();
-    }
-
-    public BigDecimal getOrderAmount() {
-        return orderAmount;
-    }
-
-    public void setOrderAmount(BigDecimal orderAmount) {
-        this.orderAmount = orderAmount;
-    }
-
-    public BigDecimal getOrderCarbonAmount() {
-        return orderCarbonAmount;
-    }
-
-    public void setOrderCarbonAmount(BigDecimal orderCarbonAmount) {
-        this.orderCarbonAmount = orderCarbonAmount;
-    }
-
-    public Integer getOrderStatus() {
-        return orderStatus;
-    }
-
-    public void setOrderStatus(Integer orderStatus) {
-        this.orderStatus = orderStatus;
-    }
-
-    public Integer getState() {
-        return state;
-    }
-
-    public void setState(Integer state) {
-        this.state = state;
-    }
-
-    public String getCreateUser() {
-        return createUser;
-    }
-
-    public void setCreateUser(String createUser) {
-        this.createUser = createUser == null ? null : createUser.trim();
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getModifiedUser() {
-        return modifiedUser;
-    }
-
-    public void setModifiedUser(String modifiedUser) {
-        this.modifiedUser = modifiedUser == null ? null : modifiedUser.trim();
-    }
-
-    public Date getModifiedTime() {
-        return modifiedTime;
-    }
-
-    public void setModifiedTime(Date modifiedTime) {
-        this.modifiedTime = modifiedTime;
-    }
-
-    public String getCustomerName() {
-        return customerName;
-    }
-
-    public void setCustomerName(String customerName) {
-        this.customerName = customerName==null?null:customerName.trim();
-    }
-
-    public String getCustomerType() {
-        return customerType;
-    }
-
-    public void setCustomerType(String customerType) {
-        this.customerType = customerType==null?null:customerType.trim();
-    }
-
-    public String getPayNo() {
-        return payNo;
-    }
-
-    public void setPayNo(String payNo) {
-        this.payNo = payNo==null?null:payNo.trim();
-    }
+    @ApiModelProperty("订单类型0:线上订单，1：线上申请后台生成订单，2：后台直接生成订单")
+    private Integer orderType;
 }

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/controller/web/CustomerController.java

@@ -34,7 +34,7 @@ import java.util.Objects;
  */
 @RestController
 @RequestMapping("/wap/customer")
-@Api(description = "H5端客户服务")
+@Api(tags = "用户服务")
 public class CustomerController extends BaseController {
     @Autowired
     private CustomerService customerService;
@@ -59,7 +59,7 @@ public class CustomerController extends BaseController {
     })
     @ApiResponse(code =0,message = "查询成功")
     @PostMapping("/customerLogin")
-    public ResponseBase login(@RequestBody LoginForm loginForm){
+    public ResponseBase<Map<String, String>> login(@RequestBody LoginForm loginForm){
         String token = customerService.login(loginForm);
         if (token == null) {
              Asserts.fail("用户名或密码错误");

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/controller/web/FarmerManagerController.java

@@ -24,7 +24,6 @@ import java.util.concurrent.TimeUnit;
  */
 @RestController
 @RequestMapping("/wap/farmer")
-@Api(description = "H5端贫困户服务")
 public class FarmerManagerController extends CarbonBaseController {
 
     /**

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/controller/web/OrderManagerController.java

@@ -31,7 +31,7 @@ import java.util.Objects;
 @Slf4j
 @RestController
 @RequestMapping("/wap/order")
-@Api(description = "H5订单服务")
+@Api(tags = "订单服务")
 public class OrderManagerController extends CarbonBaseController {
 
     @Autowired
@@ -60,7 +60,7 @@ public class OrderManagerController extends CarbonBaseController {
     @ApiOperation(value = "生成订单信息", notes = "生成订单信息")
     @PostMapping("/createOrder")
     @AuthCarbonValidate
-    public ResponseBase createOrder(@RequestBody CreateOrderFrom createOrderFrom) {
+    public ResponseBase<GoodsOrderInfo> createOrder(@RequestBody CreateOrderFrom createOrderFrom) {
 
         GoodsOrderInfo goodsOrderInfo = orderInfoService.createOrder(createOrderFrom);
 
@@ -73,10 +73,9 @@ public class OrderManagerController extends CarbonBaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "orderType", value = "爱心用户信息", dataType = "Integer", paramType = "query")
     })
-    @ApiResponse(code = 0, message = "操作成功")
     @PostMapping("/searchByPage")
     @AuthCarbonValidate
-    public ResponseBase searchCustomerOrderByClass(@RequestBody OrderQueryForm queryForm) {
+    public ResponseBase<GoodsOrderInfoForm> searchCustomerOrderByClass(@RequestBody OrderQueryForm queryForm) {
         CustomerInfoForm customerInfo = customerService.getCurrentMember();
 
         GoodsOrderInfoForm goodsOrderInfoForm = new GoodsOrderInfoForm();
@@ -89,10 +88,6 @@ public class OrderManagerController extends CarbonBaseController {
     }
 
     @ApiOperation(value = "查询爱心用户订单信息", notes = "分类查询爱心用户订单")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "orderType", value = "爱心用户信息", dataType = "Integer", paramType = "query")
-    })
-    @ApiResponse(code = 0, message = "操作成功")
     @GetMapping("/info")
     @AuthCarbonValidate
     public ResponseBase info(@RequestParam String orderId) {
@@ -117,10 +112,6 @@ public class OrderManagerController extends CarbonBaseController {
     }
 
     @ApiOperation(value = "查询爱心用户证书信息", notes = "分类查询爱心用户证书")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "customerInfoForm", value = "爱心用户信息", dataType = "CustomerInfoForm")
-    })
-    @ApiResponse(code = 0, message = "操作成功")
     @PostMapping("/searchCredentialList")
     @AuthCarbonValidate
     public ResponseBase searchCredentialInfo(@RequestBody GoodsCredentialInfoForm goodsCredentialInfoForm) {
@@ -136,10 +127,6 @@ public class OrderManagerController extends CarbonBaseController {
 
 
     @ApiOperation(value = "生成订单信息", notes = "生成订单信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "orderId", value = "订单Id", dataType = "String")
-    })
-    @ApiResponse(code = 0, message = "操作成功")
     @PostMapping("/saveOrderInfo")
     @AuthCarbonValidate
     public ResponseBase saveOrderInfo(@RequestBody GoodsOrderInfoForm goodsOrderInfoForm) {

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/controller/web/WechatAppController.java

@@ -55,7 +55,7 @@ import java.util.concurrent.TimeUnit;
 @Slf4j
 @Controller
 @RequestMapping("/wechat/app")
-@Api(description = "微信小程序api服务")
+@Api(tags = "微信小程序api服务")
 public class WechatAppController extends BaseController {
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
@@ -73,7 +73,7 @@ public class WechatAppController extends BaseController {
     @ApiOperation(value = "微信登录", notes = "微信登录")
     @PostMapping("/login")
     @ResponseBody
-    public ResponseBase login(@RequestBody LoginRequest request) {
+    public ResponseBase<Map<String, String>> login(@RequestBody LoginRequest request) {
         String code = request.getCode();
         if (StringUtils.isBlank(code)) {
             return resultVOError("请输入code错误!");
@@ -134,251 +134,251 @@ public class WechatAppController extends BaseController {
         return resultVOSuccess();
     }
 
-    private Map<String, Object> getStringObjectMap(String customerId) {
-        CustomerInfoForm customerInfoForm = customerInfoService.queryByPrimaryKey(customerId);
-        CustomerInfo data = BeanCopyUtil.convertBean(customerInfoForm, CustomerInfo.class);
-//        CustomerInfo data = resultVO.getData();
-        String guid = data.getGuid();
-        Map<String, Object> resultMap = new HashMap<>();
-        ValueOperations<String, Object> operations = redisTemplate.opsForValue();
-        Token token = TokenUtil.createJwtToken(guid, GlobleConstant.CURRENT_MEMBER);
-        String accessToken = token.getAccessToken();
-        resultMap.put("accessToken", accessToken);
-        resultMap.put(WECHAT_USER_INFO, data);
-        operations.set(token.getAccessToken(), resultMap, GlobleConstant.TOKEN_EXPIRES_SECOND, TimeUnit.SECONDS);
-        return resultMap;
-    }
-
-    @Autowired
-    private RedisTemplate redisTemplate;
-
-    private static final String WECHAT_USER_INFO = "wechatUserInfo";
-
-    @GetMapping("dologin")
-    @ResponseBody
-    public ResponseBase login(String customerId) {
-        Map<String, Object> resultMap = getStringObjectMap(customerId);
-        return responseSuccess(new ResultVO(ResultEnum.SUCCESS, resultMap));
-    }
-
-
-    private MyWxMpUser getMyWxMpUser(WxMaUserInfo userInfo) {
-        String openId = userInfo.getOpenId();
-        String unionId = userInfo.getUnionId();
-        String nickName = userInfo.getNickName();
-        String gender = userInfo.getGender();
-        String avatarUrl = userInfo.getAvatarUrl();
-        MyWxMpUser myWxMpUser = new MyWxMpUser();
-        myWxMpUser.setOpenId(openId);
-        myWxMpUser.setUnionId(unionId);
-        myWxMpUser.setNickname(nickName);
-        myWxMpUser.setHeadImgUrl(avatarUrl);
-        myWxMpUser.setSex(1);
-        return myWxMpUser;
-    }
-
-
-    @Value("${wx.pay.wxpayAppcallbackurl}")
-    private String wxpayCallbackUrl;
-
-    @Autowired
-    private WxPayService wxPayService;
-
-
-    @PostMapping("/pay")
-    @AuthCarbonValidate
-    @ResponseBody
-    public ResponseBase pay(HttpServletRequest request) {
-//        String orderId = wxPayFrom.getOrderId();
-//        String openid = wxPayFrom.getOpenid();
-//        String tradeType = wxPayFrom.getTradeType();
-//        ResultVO<Order> appget = orderClient.get(orderId);
-//        Order data = appget.getData();
-//        int enable = data.getEnable().intValue();
-//        if(1==enable){
-//            throw new RuntimeException("订单已支付");
+//    private Map<String, Object> getStringObjectMap(String customerId) {
+//        CustomerInfoForm customerInfoForm = customerInfoService.queryByPrimaryKey(customerId);
+//        CustomerInfo data = BeanCopyUtil.convertBean(customerInfoForm, CustomerInfo.class);
+////        CustomerInfo data = resultVO.getData();
+//        String guid = data.getGuid();
+//        Map<String, Object> resultMap = new HashMap<>();
+//        ValueOperations<String, Object> operations = redisTemplate.opsForValue();
+//        Token token = TokenUtil.createJwtToken(guid, GlobleConstant.CURRENT_MEMBER);
+//        String accessToken = token.getAccessToken();
+//        resultMap.put("accessToken", accessToken);
+//        resultMap.put(WECHAT_USER_INFO, data);
+//        operations.set(token.getAccessToken(), resultMap, GlobleConstant.TOKEN_EXPIRES_SECOND, TimeUnit.SECONDS);
+//        return resultMap;
+//    }
+
+//    @Autowired
+//    private RedisTemplate redisTemplate;
+//
+//    private static final String WECHAT_USER_INFO = "wechatUserInfo";
+//
+//    @GetMapping("dologin")
+//    @ResponseBody
+//    public ResponseBase login(String customerId) {
+//        Map<String, Object> resultMap = getStringObjectMap(customerId);
+//        return responseSuccess(new ResultVO(ResultEnum.SUCCESS, resultMap));
+//    }
+//
+//
+//    private MyWxMpUser getMyWxMpUser(WxMaUserInfo userInfo) {
+//        String openId = userInfo.getOpenId();
+//        String unionId = userInfo.getUnionId();
+//        String nickName = userInfo.getNickName();
+//        String gender = userInfo.getGender();
+//        String avatarUrl = userInfo.getAvatarUrl();
+//        MyWxMpUser myWxMpUser = new MyWxMpUser();
+//        myWxMpUser.setOpenId(openId);
+//        myWxMpUser.setUnionId(unionId);
+//        myWxMpUser.setNickname(nickName);
+//        myWxMpUser.setHeadImgUrl(avatarUrl);
+//        myWxMpUser.setSex(1);
+//        return myWxMpUser;
+//    }
+//
+//
+//    @Value("${wx.pay.wxpayAppcallbackurl}")
+//    private String wxpayCallbackUrl;
+//
+//    @Autowired
+//    private WxPayService wxPayService;
+//
+//
+//    @PostMapping("/pay")
+//    @AuthCarbonValidate
+//    @ResponseBody
+//    public ResponseBase pay(HttpServletRequest request) {
+////        String orderId = wxPayFrom.getOrderId();
+////        String openid = wxPayFrom.getOpenid();
+////        String tradeType = wxPayFrom.getTradeType();
+////        ResultVO<Order> appget = orderClient.get(orderId);
+////        Order data = appget.getData();
+////        int enable = data.getEnable().intValue();
+////        if(1==enable){
+////            throw new RuntimeException("订单已支付");
+////        }
+//        WxPayUnifiedOrderRequest orderRequest = new WxPayUnifiedOrderRequest();
+//        //随机字符串
+//        String s = UUIDUtils.randomUUID();
+//
+//        orderRequest.setNonceStr(s);
+//        //商品描述
+//        orderRequest.setBody("碳汇扶贫!");
+//        //商户订单号(支付编号)
+//        GeneratorIdUtils generatorIdUtils = new GeneratorIdUtils();
+//        String orderNum = generatorIdUtils.nextId();
+//        log.info("orderNum:" + orderNum);
+//        //设置商户订单号
+//        orderRequest.setOutTradeNo(orderNum);
+//        //设置支付id
+////        data.setTransId(orderNum);
+//        //设置金额
+////        BigDecimal money = data.getTotalPrice();
+//        //元转成分
+////        money = money.multiply(new BigDecimal(100));
+////        int i = money.intValue();
+////        if ("test".equals(tradeType)) {
+////            //测试环境一分钱
+////            orderRequest.setTotalFee(1);
+////        } else {
+////            orderRequest.setTotalFee(i);
+////        }
+//        //终端ip
+//        String ipAddress = getIpAddress(request);
+//        orderRequest.setSpbillCreateIp(ipAddress);
+//        // 通知地址 支付成功后回调地址
+//        log.info("wxpayCallbackUrl=================>{}", wxpayCallbackUrl);
+//        orderRequest.setNotifyUrl(wxpayCallbackUrl);
+//        //交易类型
+//        orderRequest.setTradeType(WxPayConstants.TradeType.APP);
+//        //用户标识 获取用户openid
+////        orderRequest.setOpenid(openid);
+//        // 这个可能是偏向原生一点的统一下单，返回的参数有很多没用的 或者null值 建议使用 createOrder下单
+//        Object unOrder = null;
+//        try {
+//            unOrder = wxPayService.createOrder(orderRequest);
+//        } catch (WxPayException e) {
+//            //e.printStackTrace();
+//            log.error(e.getMessage());
+//            //签名完成新增支付订单
+//            ResultVO resultVO = new ResultVO();
+//            resultVO.setCode(1);
+//            resultVO.setMsg("微信支付失败!");
+//            return responseError(resultVO);
 //        }
-        WxPayUnifiedOrderRequest orderRequest = new WxPayUnifiedOrderRequest();
-        //随机字符串
-        String s = UUIDUtils.randomUUID();
-
-        orderRequest.setNonceStr(s);
-        //商品描述
-        orderRequest.setBody("碳汇扶贫!");
-        //商户订单号(支付编号)
-        GeneratorIdUtils generatorIdUtils = new GeneratorIdUtils();
-        String orderNum = generatorIdUtils.nextId();
-        log.info("orderNum:" + orderNum);
-        //设置商户订单号
-        orderRequest.setOutTradeNo(orderNum);
-        //设置支付id
-//        data.setTransId(orderNum);
-        //设置金额
-//        BigDecimal money = data.getTotalPrice();
-        //元转成分
-//        money = money.multiply(new BigDecimal(100));
-//        int i = money.intValue();
-//        if ("test".equals(tradeType)) {
-//            //测试环境一分钱
-//            orderRequest.setTotalFee(1);
+//        //更新本地订单支付id
+////        orderClient.update(data);
+//        //签名完成新增支付订单
+//        ResultVO resultVO = new ResultVO();
+//        resultVO.setCode(0);
+//        resultVO.setData(unOrder);
+//        return responseSuccess(resultVO);
+//    }
+//
+//
+//    /**
+//     * wx支付成功回调接口
+//     *
+//     * @param request
+//     * @param response
+//     * @throws IOException
+//     */
+//    @RequestMapping("payResult")
+//    public void payResult(HttpServletRequest request, HttpServletResponse response) throws IOException {
+//        log.info("微信支付返回通知函数开始---------------------");
+//
+//        InputStream inStream = request.getInputStream();
+//        ByteArrayOutputStream outSteam = new ByteArrayOutputStream();
+//        byte[] buffer = new byte[1024];
+//        int len = 0;
+//        while ((len = inStream.read(buffer)) != -1) {
+//            outSteam.write(buffer, 0, len);
+//        }
+//        outSteam.close();
+//        inStream.close();
+//        String result = new String(outSteam.toByteArray(), "utf-8");
+//        boolean isPayOk = false;
+//        WxPayOrderNotifyResult wxPayOrderNotifyResult = null;
+//        // 此处调用订单查询接口验证是否交易成功
+//        try {
+//            wxPayOrderNotifyResult = wxPayService.parseOrderNotifyResult(result);
+//            if ("SUCCESS".equals(wxPayOrderNotifyResult.getResultCode())) {
+//                isPayOk = true;
+//            }
+//            log.info("解析数据:" + wxPayOrderNotifyResult.toString());
+//        } catch (WxPayException e) {
+//            e.printStackTrace();
+//        }
+//        String noticeStr = "";
+//        // 支付成功，商户处理后同步返回给微信参数
+//        PrintWriter writer = response.getWriter();
+//        if (isPayOk) {
+//            //建议在这里处理付款完成的业务（虽然前端也可以处理后续业务，但是前端处理并不安全，例如：客户突然关闭浏览器了等情况，付款成功后续的业务将中断）
+//            //支付订单支付编号
+//            System.out.println("===============付款成功，业务开始处理==============");
+//            String orderNum = wxPayOrderNotifyResult.getOutTradeNo();
+//            log.info("orderNum:" + orderNum);
+//
+////            Order order=new Order();
+////            order.setTransId(orderNum);
+////            //将订单更新为支付
+////            orderClient.payment(order);
+//            /**
+//             * 自己的业务
+//             */
+//            System.out.println("===============付款成功，业务处理完毕==============");
+//            // 通知微信已经收到消息，不要再给我发消息了，否则微信会8连击调用本接口
+//            noticeStr = setXML("SUCCESS", "OK");
+//            log.info("收到通知返回给微信api信息:-----------" + noticeStr);
+//            writer.write(noticeStr);
+//            writer.flush();
 //        } else {
-//            orderRequest.setTotalFee(i);
+//            // 支付失败， 记录流水失败
+//            noticeStr = setXML("FAIL", "");
+//            writer.write(noticeStr);
+//            writer.flush();
+//            System.out.println("===============支付失败==============");
 //        }
-        //终端ip
-        String ipAddress = getIpAddress(request);
-        orderRequest.setSpbillCreateIp(ipAddress);
-        // 通知地址 支付成功后回调地址
-        log.info("wxpayCallbackUrl=================>{}", wxpayCallbackUrl);
-        orderRequest.setNotifyUrl(wxpayCallbackUrl);
-        //交易类型
-        orderRequest.setTradeType(WxPayConstants.TradeType.APP);
-        //用户标识 获取用户openid
-//        orderRequest.setOpenid(openid);
-        // 这个可能是偏向原生一点的统一下单，返回的参数有很多没用的 或者null值 建议使用 createOrder下单
-        Object unOrder = null;
-        try {
-            unOrder = wxPayService.createOrder(orderRequest);
-        } catch (WxPayException e) {
-            //e.printStackTrace();
-            log.error(e.getMessage());
-            //签名完成新增支付订单
-            ResultVO resultVO = new ResultVO();
-            resultVO.setCode(1);
-            resultVO.setMsg("微信支付失败!");
-            return responseError(resultVO);
-        }
-        //更新本地订单支付id
-//        orderClient.update(data);
-        //签名完成新增支付订单
-        ResultVO resultVO = new ResultVO();
-        resultVO.setCode(0);
-        resultVO.setData(unOrder);
-        return responseSuccess(resultVO);
-    }
-
-
-    /**
-     * wx支付成功回调接口
-     *
-     * @param request
-     * @param response
-     * @throws IOException
-     */
-    @RequestMapping("payResult")
-    public void payResult(HttpServletRequest request, HttpServletResponse response) throws IOException {
-        log.info("微信支付返回通知函数开始---------------------");
-
-        InputStream inStream = request.getInputStream();
-        ByteArrayOutputStream outSteam = new ByteArrayOutputStream();
-        byte[] buffer = new byte[1024];
-        int len = 0;
-        while ((len = inStream.read(buffer)) != -1) {
-            outSteam.write(buffer, 0, len);
-        }
-        outSteam.close();
-        inStream.close();
-        String result = new String(outSteam.toByteArray(), "utf-8");
-        boolean isPayOk = false;
-        WxPayOrderNotifyResult wxPayOrderNotifyResult = null;
-        // 此处调用订单查询接口验证是否交易成功
-        try {
-            wxPayOrderNotifyResult = wxPayService.parseOrderNotifyResult(result);
-            if ("SUCCESS".equals(wxPayOrderNotifyResult.getResultCode())) {
-                isPayOk = true;
-            }
-            log.info("解析数据:" + wxPayOrderNotifyResult.toString());
-        } catch (WxPayException e) {
-            e.printStackTrace();
-        }
-        String noticeStr = "";
-        // 支付成功，商户处理后同步返回给微信参数
-        PrintWriter writer = response.getWriter();
-        if (isPayOk) {
-            //建议在这里处理付款完成的业务（虽然前端也可以处理后续业务，但是前端处理并不安全，例如：客户突然关闭浏览器了等情况，付款成功后续的业务将中断）
-            //支付订单支付编号
-            System.out.println("===============付款成功，业务开始处理==============");
-            String orderNum = wxPayOrderNotifyResult.getOutTradeNo();
-            log.info("orderNum:" + orderNum);
-
-//            Order order=new Order();
-//            order.setTransId(orderNum);
-//            //将订单更新为支付
-//            orderClient.payment(order);
-            /**
-             * 自己的业务
-             */
-            System.out.println("===============付款成功，业务处理完毕==============");
-            // 通知微信已经收到消息，不要再给我发消息了，否则微信会8连击调用本接口
-            noticeStr = setXML("SUCCESS", "OK");
-            log.info("收到通知返回给微信api信息:-----------" + noticeStr);
-            writer.write(noticeStr);
-            writer.flush();
-        } else {
-            // 支付失败， 记录流水失败
-            noticeStr = setXML("FAIL", "");
-            writer.write(noticeStr);
-            writer.flush();
-            System.out.println("===============支付失败==============");
-        }
-    }
-
-
-    /**
-     * //签名成功生成支付订单
-     *
-     * @return
-     * @throws GeneralSecurityException
-     */
-    private void insertPayOrder(Object object) {
-
-
-    }
-
-    public static String setXML(String return_code, String return_msg) {
-        return "<xml><return_code><![CDATA[" + return_code + "]]></return_code><return_msg><![CDATA[" + return_msg + "]]></return_msg></xml>";
-    }
-
-    public static String getIpAddress(HttpServletRequest request) {
-        String ip = request.getHeader("x-forwarded-for");
-        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-            ip = request.getHeader("Proxy-Client-IP");
-        }
-        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-            ip = request.getHeader("WL-Proxy-Client-IP");
-        }
-        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-            ip = request.getHeader("HTTP_CLIENT_IP");
-        }
-        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-            ip = request.getHeader("HTTP_X_FORWARDED_FOR");
-        }
-        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
-            ip = request.getRemoteAddr();
-        }
-        String[] split = ip.split(",");
-        ip = split[0];
-        return ip;
-    }
-
-    /**
-     * <pre>
-     * 获取用户绑定手机号信息
-     * </pre>
-     */
-    @GetMapping("/phone")
-    public String phone(String sessionKey, String signature,
-                        String rawData, String encryptedData, String iv) {
-
-        // 用户信息校验
-        if (!wxMaService.getUserService().checkUserInfo(sessionKey, rawData, signature)) {
-            return "user check failed";
-        }
-
-        // 解密
-        WxMaPhoneNumberInfo phoneNoInfo = wxMaService.getUserService().getPhoneNoInfo(sessionKey, encryptedData, iv);
-
-        return JsonUtils.toJson(phoneNoInfo);
-    }
+//    }
+//
+//
+//    /**
+//     * //签名成功生成支付订单
+//     *
+//     * @return
+//     * @throws GeneralSecurityException
+//     */
+//    private void insertPayOrder(Object object) {
+//
+//
+//    }
+//
+//    public static String setXML(String return_code, String return_msg) {
+//        return "<xml><return_code><![CDATA[" + return_code + "]]></return_code><return_msg><![CDATA[" + return_msg + "]]></return_msg></xml>";
+//    }
+//
+//    public static String getIpAddress(HttpServletRequest request) {
+//        String ip = request.getHeader("x-forwarded-for");
+//        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+//            ip = request.getHeader("Proxy-Client-IP");
+//        }
+//        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+//            ip = request.getHeader("WL-Proxy-Client-IP");
+//        }
+//        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+//            ip = request.getHeader("HTTP_CLIENT_IP");
+//        }
+//        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+//            ip = request.getHeader("HTTP_X_FORWARDED_FOR");
+//        }
+//        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+//            ip = request.getRemoteAddr();
+//        }
+//        String[] split = ip.split(",");
+//        ip = split[0];
+//        return ip;
+//    }
+//
+//    /**
+//     * <pre>
+//     * 获取用户绑定手机号信息
+//     * </pre>
+//     */
+//    @GetMapping("/phone")
+//    public String phone(String sessionKey, String signature,
+//                        String rawData, String encryptedData, String iv) {
+//
+//        // 用户信息校验
+//        if (!wxMaService.getUserService().checkUserInfo(sessionKey, rawData, signature)) {
+//            return "user check failed";
+//        }
+//
+//        // 解密
+//        WxMaPhoneNumberInfo phoneNoInfo = wxMaService.getUserService().getPhoneNoInfo(sessionKey, encryptedData, iv);
+//
+//        return JsonUtils.toJson(phoneNoInfo);
+//    }
 
 
 }

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/controller/web/WechatAppPayController.java

@@ -34,7 +34,7 @@ import java.math.BigDecimal;
 @Slf4j
 @Controller
 @RequestMapping("/wechat/pay")
-@Api(description = "微信小程序支付服务")
+@Api(tags = "微信小程序支付服务")
 public class WechatAppPayController extends BaseController {
 
 

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/h5/controller/web/WechatManagerController.java

@@ -51,7 +51,6 @@ import java.util.concurrent.TimeUnit;
 @Slf4j
 @RestController
 @RequestMapping("/wap/weChat")
-@Api(description = "H5微信api服务")
 public class WechatManagerController extends CarbonBaseController {
 
     private static final String WECHAT_AUTH_SCOPE = "snsapi_userinfo";