bugfix

src/main/java/com/caimei365/order/components/HeliPayUtil.java

@@ -73,7 +73,7 @@ public class HeliPayUtil {
         }
         if ("second".equals(payFlag)) {
             //二手支付固定100
-            pay.setP9_orderAmount("100");
+            pay.setP9_orderAmount("1");
             //二手
             orderId = heliDto.getProductId() + "T" + time + environment;
             pay.setP12_notifyUrl(secondHandUrl);
@@ -178,7 +178,7 @@ public class HeliPayUtil {
             environment = "BETA";
         }
         if ("second".equals(payFlag)) {
-            pay.setP5_orderAmount("100");
+            pay.setP5_orderAmount("1");
             pay.setP9_notifyUrl(secondHandUrl);
             orderId = heliDto.getProductId() + "T" + time + environment;
             String product = "采美订单" + orderId;
@@ -259,7 +259,7 @@ public class HeliPayUtil {
             }
             if ("second".equals(payFlag)) {
                 pay.setP3_customerNumber(Constant.CUSTOMERNUM);
-                pay.setP4_orderAmount("100");
+                pay.setP4_orderAmount("1");
                 pay.setP12_serverCallback(secondUnionPay);
                 orderId = heliDto.getProductId() + "T" + time + environment;
                 String product = "采美订单" + orderId;

src/main/java/com/caimei365/order/controller/OrderClubApi.java

@@ -26,7 +26,7 @@ import java.util.Map;
  * @author : Charles
  * @date : 2021/7/19
  */
-@Api(tags="机构订单API")
+@Api(tags = "机构订单API")
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/order/club")
@@ -41,7 +41,7 @@ public class OrderClubApi {
     @ApiOperation("获取各状态订单数量（旧：/pcCenter/getOrderNum）")
     @ApiImplicitParam(required = true, name = "userId", value = "用户Id")
     @GetMapping("/count")
-    public  ResponseJson<Map<String, Object>> getOrderCount(Integer userId) {
+    public ResponseJson<Map<String, Object>> getOrderCount(Integer userId) {
         if (null == userId) {
             return ResponseJson.error("用户Id不能为空！", null);
         }
@@ -63,8 +63,8 @@ public class OrderClubApi {
     })
     @GetMapping("/list")
     public ResponseJson<PageInfo<ShopOrderVo>> getOrderList(Integer userId, Integer orderState, String orderNo, String beginTime, String endTime,
-                                                        @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
-                                                        @RequestParam(value = "pageSize", defaultValue = "10") int pageSize) {
+                                                            @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+                                                            @RequestParam(value = "pageSize", defaultValue = "10") int pageSize) {
         if (null == userId) {
             return ResponseJson.error("用户Id不能为空！", null);
         }
@@ -83,8 +83,8 @@ public class OrderClubApi {
     })
     @GetMapping("/search")
     public ResponseJson<PageInfo<ShopOrderVo>> getOrderListByKeyword(Integer userId, String searchWord,
-                                                        @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
-                                                        @RequestParam(value = "pageSize", defaultValue = "10") int pageSize) {
+                                                                     @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+                                                                     @RequestParam(value = "pageSize", defaultValue = "10") int pageSize) {
         if (null == userId) {
             return ResponseJson.error("用户Id不能为空！", null);
         }
@@ -115,6 +115,7 @@ public class OrderClubApi {
 
     /**
      * 添加支付凭证
+     *
      * @param voucherDto
      * @return
      */
@@ -141,12 +142,12 @@ public class OrderClubApi {
      * 机构确认订单
      *
      * @param orderDto {
-     *                orderId      订单ID
-     * }
+     *                 orderId      订单ID
+     *                 }
      */
     @ApiOperation("机构确认订单（旧：/order/affirmOrder）")
     @PostMapping("/confirm")
-    public ResponseJson<Void> confirmOrder(OrderDto orderDto){
+    public ResponseJson<Void> confirmOrder(OrderDto orderDto) {
         if (null == orderDto.getShopOrderId()) {
             return ResponseJson.error("订单Id不能为空！", null);
         }
@@ -157,9 +158,9 @@ public class OrderClubApi {
      * 机构取消订单
      *
      * @param orderDto {
-     *                orderId      订单ID
-     *                remark       备注（订单取消原因）
-     * }
+     *                 orderId      订单ID
+     *                 remark       备注（订单取消原因）
+     *                 }
      */
     @ApiOperation("机构取消订单（旧：/order/cancel）")
     @PostMapping("/cancel")
@@ -180,7 +181,7 @@ public class OrderClubApi {
      */
     @ApiOperation("机构删除订单（旧：/order/delete）")
     @PostMapping("/delete")
-    public ResponseJson<Void> deleteOrder(OrderDto orderDto){
+    public ResponseJson<Void> deleteOrder(OrderDto orderDto) {
         if (null == orderDto.getShopOrderId()) {
             return ResponseJson.error("订单Id不能为空！", null);
         }
@@ -191,12 +192,12 @@ public class OrderClubApi {
      * 机构确认收货
      *
      * @param orderDto {
-     *                orderId      订单ID
-     * }
+     *                 orderId      订单ID
+     *                 }
      */
     @ApiOperation("机构确认收货（旧：/order/affirm）")
     @PostMapping("/receive")
-    public ResponseJson<Void> receiveGoods(OrderDto orderDto){
+    public ResponseJson<Void> receiveGoods(OrderDto orderDto) {
         if (null == orderDto.getShopOrderId()) {
             return ResponseJson.error("订单Id不能为空！", null);
         }
@@ -268,7 +269,7 @@ public class OrderClubApi {
             @ApiImplicitParam(required = false, name = "iv", value = "微信加密算法的初始向量")
     })
     @GetMapping("/share/code/identity")
-    public ResponseJson<String> identityOrderShareCode( Integer shopOrderId, Integer userId, Integer serviceProviderId, String code, String encryptedData, String iv, @RequestHeader HttpHeaders headers) {
+    public ResponseJson<String> identityOrderShareCode(Integer shopOrderId, Integer userId, Integer serviceProviderId, String code, String encryptedData, String iv, @RequestHeader HttpHeaders headers) {
         //head可能报错，不确定原因，版本回退
 
         if (null == userId) {
@@ -349,13 +350,13 @@ public class OrderClubApi {
      * 二手订单 确认打款供应商
      *
      * @param orderDto {
-     *                orderId      订单ID
-     *                userId       用户Id
-     * }
+     *                 orderId      订单ID
+     *                 userId       用户Id
+     *                 }
      */
     @ApiOperation("二手订单,确认打款供应商（旧：/order/affirm/payment）")
     @PostMapping("/second/payment/confirm")
-    public ResponseJson<Void> secondPaymentConfirm(OrderDto orderDto){
+    public ResponseJson<Void> secondPaymentConfirm(OrderDto orderDto) {
         if (null == orderDto.getUserId()) {
             return ResponseJson.error("用户Id不能为空！", null);
         }
@@ -371,7 +372,7 @@ public class OrderClubApi {
     @ApiOperation("根据售后条款ID查看售后条款内容（旧：/seller/clause）")
     @ApiImplicitParam(required = false, name = "clauseId", value = "条款Id")
     @GetMapping("/clause")
-    public ResponseJson<ClauseVo> getClauseById(Integer clauseId){
+    public ResponseJson<ClauseVo> getClauseById(Integer clauseId) {
         if (null == clauseId) {
             return ResponseJson.error("售后条款Id不能为空！", null);
         }
@@ -380,6 +381,7 @@ public class OrderClubApi {
 
     /**
      * 查询供应商银行账户信息
+     *
      * @param shopId
      * @return
      */
@@ -387,13 +389,14 @@ public class OrderClubApi {
     @GetMapping("/getShopBank")
     public ResponseJson<ShopPo> getShopBankAccount(Integer shopId) {
         if (null == shopId) {
-            return ResponseJson.error(-1, "供应商Id不能为空",null);
+            return ResponseJson.error(-1, "供应商Id不能为空", null);
         }
         return orderClubService.getShopBankAccount(shopId);
     }
 
     /**
      * 分享订单 生成分享吗 供应商给机构下单
+     *
      * @param shopOrderId
      * @return
      */
@@ -428,13 +431,14 @@ public class OrderClubApi {
 
     /**
      * 分享订单校验成功、返回子订单数据
+     *
      * @param shopOrderId
      * @return
      */
     @ApiOperation("分享订单校验成功、返回子订单数据")
     @ApiImplicitParam(required = true, name = "shopOrderId", value = "子订单Id")
     @GetMapping("/getShopOrderById")
-    public ResponseJson<Map<String, Object>> getShopOrderById(Integer shopOrderId){
+    public ResponseJson<Map<String, Object>> getShopOrderById(Integer shopOrderId) {
         if (null == shopOrderId) {
             return ResponseJson.error(-1, "子订单Id不能为空", null);
         }
@@ -443,6 +447,7 @@ public class OrderClubApi {
 
     /**
      * 机构确认订单
+     *
      * @param shopOrderId
      * @param userId
      * @return