Merge remote-tracking branch 'origin/1.1' into 1.1

xuhy

2023-06-14 831e3312572cf29dd91cbd882ef3dce809ac852d

 user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/OrderController.java

@@ -349,7 +349,6 @@

    /**
     * 订单微信支付回调处理
     * @param request
     * @param response
     */
    @ResponseBody
@@ -458,13 +457,13 @@
                            List<Revenue> revenues = revenueService.selectList(new EntityWrapper<Revenue>().eq("userType", 2).eq("orderId", order.getId()));
                            Receive receive = new Receive();//确认收货
                            receive.setOriginalMerOrderId(merOrderId);
                            receive.setRcvAmount(String.valueOf(order.getPayMoney() * 100));
                            receive.setRcvAmount(String.valueOf(Double.valueOf(order.getPayMoney() * 100).intValue()));
                            List<ReceiveUser> splitList = new ArrayList<>();
                            for (Revenue revenue : revenues) {
                                Driver driver = driverService.selectById(revenue.getUserId());
                                ReceiveUser receiveUser = new ReceiveUser();
                                receiveUser.setSplitUserId(driver.getMerchantNumber());
                                receiveUser.setRcvSplitAmount(revenue.getAmount().toString());
                                receiveUser.setRcvSplitAmount(String.valueOf(Double.valueOf(revenue.getAmount() * 100).intValue()));
                                splitList.add(receiveUser);
                            }
                            receive.setSplitList(splitList);