* 功能优化

src/main/java/com/huiju/estateagents/bo/request/SaveCzOrderRequestBO.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.bo.request;
+
+import lombok.Data;
+
+/**
+ * 创建充值订单请求实体
+ *
+ * @author gusy
+ * @date 2020/6/9 14:58
+ */
+@Data
+public class SaveCzOrderRequestBO {
+
+    /**
+     * 充值金额
+     */
+    private String amount;
+}

src/main/java/com/huiju/estateagents/bo/request/SaveRefundOrderRequestBO.java

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.bo.request;
+
+import lombok.Data;
+
+/**
+ * 创建退款订单请求实体
+ *
+ * @author gusy
+ * @date 2020/6/9 14:58
+ */
+@Data
+public class SaveRefundOrderRequestBO {
+
+    /**
+     * 退款金额
+     */
+    private String amount;
+}

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -896,4 +896,9 @@ public class CommConstant {
      * 微信商户手续费率
      */
     public static final Double WXMCH_PAY_RATE = 0.01;
+
+    /**
+     * 微信商户手续费率-前端展示
+     */
+    public static final String WXMCH_PAY_RATE_STRING = "1%";
 }

src/main/java/com/huiju/estateagents/redpack/controller/TaOrgOrderController.java

@@ -14,6 +14,8 @@ import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.fastjson.JSON;
+import com.huiju.estateagents.bo.request.SaveCzOrderRequestBO;
+import com.huiju.estateagents.bo.request.SaveRefundOrderRequestBO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -248,15 +250,15 @@ public class TaOrgOrderController extends BaseController {
     /**
      * 创建充值订单
      *
-     * @param amount
+     * @param requestBO
      * @param request
      * @return
      */
     @RequestMapping(value = "/admin/orgOrder/cz/saveOrder", method = RequestMethod.PUT)
-    public ResponseBean saveCzOrder(@RequestParam(value = "amount") Double amount, HttpServletRequest request) {
+    public ResponseBean saveCzOrder(@RequestBody SaveCzOrderRequestBO requestBO, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaOrgOrderService.saveCzOrder(amount, getOrgId(request), getUserId(request), request.getRemoteAddr());
+            responseBean = iTaOrgOrderService.saveCzOrder(Double.parseDouble(requestBO.getAmount()), getOrgId(request), getUserId(request), request.getRemoteAddr());
         } catch (Exception e) {
             logger.error("saveCzOrder -=- {}", e);
             responseBean.addError(e.getMessage());
@@ -267,15 +269,15 @@ public class TaOrgOrderController extends BaseController {
     /**
      * 创建退款订单
      *
-     * @param amount
+     * @param requestBO
      * @param request
      * @return
      */
     @RequestMapping(value = "/admin/orgOrder/refund/saveOrder", method = RequestMethod.PUT)
-    public ResponseBean saveRefundOrder(@RequestParam(value = "amount") Double amount, HttpServletRequest request) {
+    public ResponseBean saveRefundOrder(@RequestBody SaveRefundOrderRequestBO requestBO, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaOrgOrderService.saveRefundOrder(amount, getOrgId(request), getUserId(request));
+            responseBean = iTaOrgOrderService.saveRefundOrder(Double.parseDouble(requestBO.getAmount()), getOrgId(request), getUserId(request));
         } catch (Exception e) {
             logger.error("refundOrder -=- {}", e);
             responseBean.addError(e.getMessage());
@@ -499,12 +501,12 @@ public class TaOrgOrderController extends BaseController {
      * @param orderId
      * @return
      */
-    @RequestMapping(value = "getOrgOrderInfo", method = RequestMethod.GET)
+    @RequestMapping(value = "/admin/orgOrder/getByInfo", method = RequestMethod.GET)
     public ResponseBean getOrgOrderInfo(String orderId) {
         ResponseBean responseBean = new ResponseBean();
         try {
             TaOrgOrder result = iTaOrgOrderService.getById(orderId);
-            if(result == null){
+            if (result == null) {
                 responseBean.addError("fail");
                 return responseBean;
             }

src/main/java/com/huiju/estateagents/redpack/service/impl/TaOrgOrderServiceImpl.java

@@ -136,10 +136,10 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
 
         //下单
         Map<String, String> data = new HashMap<String, String>();
-        data.put("body", "微信支付");
+        data.put("body", "wxzf");
         //商品号唯一
         data.put("out_trade_no", taOrgOrder.getTradeNo());
-        data.put("device_info", "");
+        data.put("device_info", "WEB");
         data.put("fee_type", "CNY");
         //金额 后台计算
         data.put("total_fee", payPrice);
@@ -149,6 +149,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         data.put("notify_url", payNotify + CommConstant.ITEM_TYPE_RECHARGE);
         // 此处指定为APP支付
         data.put("trade_type", "NATIVE");
+        data.put("product_id", taOrgOrder.getOrderId());
         Map<String, String> resp = wxpay.unifiedOrder(data);
         log.info("下单成功：{}", resp);
         if (resp.get("result_code").equalsIgnoreCase(WXPayConstants.FAIL)) {
@@ -170,7 +171,7 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         }
 
         // 计算支付金额
-        Double realAmount = amount * (amount * CommConstant.WXMCH_PAY_RATE);
+        Double realAmount = amount * (1 + CommConstant.WXMCH_PAY_RATE);
 
         // 1.创建订单主表信息
         TaOrgOrder taOrgOrder = new TaOrgOrder();
@@ -178,6 +179,8 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         taOrgOrder.setTradeNo(CommonUtils.generateTradeNo(CommConstant.RECHARGE));
         taOrgOrder.setAmount(CommonUtils.yuanToFen(realAmount));
         taOrgOrder.setCreateDate(LocalDateTime.now());
+        taOrgOrder.setExpiryDate(LocalDateTime.now().plusMinutes(30));
+        taOrgOrder.setRemark("线上充值");
         taOrgOrder.setStatus(CommConstant.STATUS_NORMAL);
         taOrgOrder.setTradingStatus(CommConstant.TRADING_STATUS_PROCESSING);
         taOrgOrder.setIsOffline(false);
@@ -212,8 +215,8 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         JSONObject obj = new JSONObject();
         obj.put("amount", amount);
         obj.put("realAmount", realAmount);
-        obj.put("serviceFee", realAmount - amount);
-        obj.put("mchPayRate", CommConstant.WXMCH_PAY_RATE);
+        obj.put("serviceFee", amount * CommConstant.WXMCH_PAY_RATE);
+        obj.put("mchPayRate", CommConstant.WXMCH_PAY_RATE_STRING);
         obj.put("payQrCode", payResult.getData());
         obj.put("orderInfo", taOrgOrder);
         responseBean.addSuccess(obj);
@@ -237,6 +240,8 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         taOrgOrder.setTradeNo(CommonUtils.generateTradeNo(CommConstant.REFUND));
         taOrgOrder.setAmount(CommonUtils.yuanToFen(amount));
         taOrgOrder.setCreateDate(LocalDateTime.now());
+        taOrgOrder.setExpiryDate(LocalDateTime.now().plusDays(7));
+        taOrgOrder.setRemark("线上退款");
         taOrgOrder.setStatus(CommConstant.STATUS_NORMAL);
         taOrgOrder.setTradingStatus(CommConstant.TRADING_STATUS_PROCESSING);
         taOrgOrder.setIsOffline(false);