新增支付通道

feifan-module-pay/feifan-module-pay-biz/src/main/java/cn/newfeifan/mall/module/pay/controller/app/fuyouorder/NewPayOrderController.java

@@ -35,16 +35,9 @@ public class NewPayOrderController {
     @Operation(summary = "向富友提交支付订单")
     public CommonResult<String> submitFuYouPayOrder(@RequestBody SubmitOrderRequestVO reqVO) {
 
-        try{
         String respVO = fuYouPayOrderService.submitOrder(reqVO);
 
-        }catch (Exception e){
-            ErrorCode err = new ErrorCode(1,e.getMessage() + "===1");
-            throw exception(err);
-        }
-
-
-        return success("success");
+        return success(respVO);
     }
 
     @PostMapping("/test1")

feifan-module-pay/feifan-module-pay-biz/src/main/java/cn/newfeifan/mall/module/pay/service/fuyouorder/FiYouPayOrderServiceImpl.java

@@ -38,54 +38,46 @@ public class FiYouPayOrderServiceImpl implements FuYouPayOrderService {
     @Override
     public String submitOrder(SubmitOrderRequestVO requestVO) {
 
-        String str = "";
-
-        try {
-            str = "获取payOrder";
-            // 1.1 获得 PayOrderDO ，并校验其是否存在
-            PayOrderDO payOrder = payOrderService.validateOrderCanSubmit(requestVO.getId());
-
-            FuiouHttpPoster http = new FuiouHttpPoster();
-            http.setCharset("utf-8");
-            http.setUrl("https://aipay.fuioupay.com/aggregatePay/wxPreCreate");
-            requestVO.getReq().setTerm_id("88888888");
-            requestVO.getReq().setTerm_ip("192.168.8.8");
-            requestVO.getReq().setRandom_str(DateUtils.getCurrentDate("yyyyMMddHHmmss")
-                    + "568974");
-            requestVO.getReq().setMchnt_cd(mchnt_cd);
+        // 1.1 获得 PayOrderDO ，并校验其是否存在
+        PayOrderDO payOrder = payOrderService.validateOrderCanSubmit(requestVO.getId());
+
+        FuiouHttpPoster http = new FuiouHttpPoster();
+        http.setCharset("utf-8");
+        http.setUrl("https://aipay.fuioupay.com/aggregatePay/wxPreCreate");
+        requestVO.getReq().setTerm_id("88888888");
+        requestVO.getReq().setTerm_ip("192.168.8.8");
+        requestVO.getReq().setRandom_str(DateUtils.getCurrentDate("yyyyMMddHHmmss")
+                + "568974");
+        requestVO.getReq().setMchnt_cd(mchnt_cd);
 //        requestVO.getReq().setTrade_type("JSAPI");
 //      req.setOpenid("oDax96l0bZdXqRQ2uVfn_2LV-DxM");//微信支付此字段必填
 //		req.setSub_openid("221122121");//支付宝支付此字段必填
-            requestVO.getReq().setOrder_amt(String.valueOf(payOrder.getPrice() / 100));
-            requestVO.getReq().setGoods_des(payOrder.getBody());
+        requestVO.getReq().setOrder_amt(String.valueOf(payOrder.getPrice() / 100));
+        requestVO.getReq().setGoods_des(payOrder.getBody());
 //        requestVO.getReq().setOpenid("osMm86Ggu3iLCkdCO2j4Zan-fHOQ");
 //        requestVO.getReq().setSub_openid("osMm86Ggu3iLCkdCO2j4Zan-fHOQ");
 //        requestVO.getReq().setSub_appid("wxe133514440a8829d");
-            requestVO.getReq().setSub_appid(appid);
-            requestVO.getReq().setMchnt_order_no(payOrder.getPayOrderNo());//不能重复
-            requestVO.getReq().setTxn_begin_ts(DateUtils.getCurrentDate("yyyyMMddHHmmss"));
-            requestVO.getReq().setNotify_url("https://zxpt.newfeifan.cn/fuYou/pay/order/notify");
-            requestVO.getReq().setVersion("1.0");
-            StringBuilder sb = new StringBuilder();
-            sb.append(requestVO.getReq().getMchnt_cd().trim()).append("|")
-                    .append(requestVO.getReq().getTrade_type().trim()).append("|")
-                    .append(requestVO.getReq().getOrder_amt().trim()).append("|")
-                    .append(requestVO.getReq().getMchnt_order_no().trim()).append("|")
-                    .append(requestVO.getReq().getTxn_begin_ts()).append("|")
-                    .append(requestVO.getReq().getGoods_des()).append("|")
-                    .append(requestVO.getReq().getTerm_id()).append("|")
-                    .append(requestVO.getReq().getTerm_ip()).append("|")
-                    .append(requestVO.getReq().getNotify_url()).append("|")
-                    .append(requestVO.getReq().getRandom_str()).append("|")
-                    .append(requestVO.getReq().getVersion()).append("|")
-                    .append(privateKey);
-            requestVO.getReq().setSign(MD5.MD5Encode(sb.toString()));
-            String res = null;
-            str = "发请求";
-            ErrorCode err = new ErrorCode(1, "发请求");
-            if (true) {
-                throw exception(err);
-            }
+        requestVO.getReq().setSub_appid(appid);
+        requestVO.getReq().setMchnt_order_no(payOrder.getPayOrderNo());//不能重复
+        requestVO.getReq().setTxn_begin_ts(DateUtils.getCurrentDate("yyyyMMddHHmmss"));
+        requestVO.getReq().setNotify_url("https://zxpt.newfeifan.cn/fuYou/pay/order/notify");
+        requestVO.getReq().setVersion("1.0");
+        StringBuilder sb = new StringBuilder();
+        sb.append(requestVO.getReq().getMchnt_cd().trim()).append("|")
+                .append(requestVO.getReq().getTrade_type().trim()).append("|")
+                .append(requestVO.getReq().getOrder_amt().trim()).append("|")
+                .append(requestVO.getReq().getMchnt_order_no().trim()).append("|")
+                .append(requestVO.getReq().getTxn_begin_ts()).append("|")
+                .append(requestVO.getReq().getGoods_des()).append("|")
+                .append(requestVO.getReq().getTerm_id()).append("|")
+                .append(requestVO.getReq().getTerm_ip()).append("|")
+                .append(requestVO.getReq().getNotify_url()).append("|")
+                .append(requestVO.getReq().getRandom_str()).append("|")
+                .append(requestVO.getReq().getVersion()).append("|")
+                .append(privateKey);
+        requestVO.getReq().setSign(MD5.MD5Encode(sb.toString()));
+        String res = null;
+        try {
             res = http.newPost(JSON.toJSONString(requestVO.getReq()));
 
             // 解析返回结果,获取参数
@@ -106,8 +98,7 @@ public class FiYouPayOrderServiceImpl implements FuYouPayOrderService {
                     .build();
             return JSON.toJSONString(vo);
         } catch (Exception e) {
-            ErrorCode err = new ErrorCode(1, e.getMessage() + "===" + str);
-            throw exception(err);
+            throw exception(SUBMIT_ORDER_ERROR);
         }
     }