Merge branch 'online'

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/open/UserOrderClient.java

@@ -120,7 +120,7 @@ public class UserOrderClient extends BaseController {
             } catch (BizException e) {
                 log.error("回调业务异常，data is {}, msg is {}", JSONObject.toJSONString(data), e.getMessage());
             } catch (Exception e) {
-                log.error("回调业务异常，data is {}", JSONObject.toJSONString(data));
+                log.error("回调业务异常，data is {} , msg is {}", JSONObject.toJSONString(data),e.getMessage());
                 e.printStackTrace();
             }
         }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserOrderServiceImpl.java

@@ -961,12 +961,17 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
         }
         BigDecimal platformFee = expectPrice.multiply(platformFeeRate).setScale(2, RoundingMode.HALF_UP);
         platformFee = platformFee.subtract(orderDetailVo.getCouponAmount());
-
-        // 订单实收
-        AccountBizTypeEnum bizTypeEnum = AccountBizTypeEnum.valueOf(orderDetailVo.getGoodType().getCode());
-        PlatformCashAccountRecord platformCashAccountRecord = new PlatformCashAccountRecord(orderDetailVo.getUserId(), orderDetailVo.getActualPrice(),
-                    InOrOutEnum.IN, PostStatusEnum.RECORDED, bizTypeEnum, orderDetailVo.getBizId(),
-                    orderDetailVo.getOrderNo(), new Date());
+        PlatformCashAccountRecord platformCashAccountRecord;
+        if (GoodTypeEnum.PINAO_ROOM.equals(orderDetailVo.getGoodType())) {
+            platformCashAccountRecord = new PlatformCashAccountRecord(orderDetailVo.getUserId(), platformFee,
+                                                                      InOrOutEnum.IN, PostStatusEnum.RECORDED, AccountBizTypeEnum.PIAON_ROOM, orderDetailVo.getBizId(),
+                                                                      orderDetailVo.getOrderNo(), new Date());
+        } else {
+            AccountBizTypeEnum bizTypeEnum = AccountBizTypeEnum.valueOf(orderDetailVo.getGoodType().getCode());
+            platformCashAccountRecord = new PlatformCashAccountRecord(orderDetailVo.getUserId(), platformFee,
+                                                                      InOrOutEnum.IN, PostStatusEnum.RECORDED, bizTypeEnum, orderDetailVo.getBizId(),
+                                                                      orderDetailVo.getOrderNo(), new Date());
+        }
         platformCashAccountRecordService.save(platformCashAccountRecord);
 
 
@@ -980,7 +985,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
             //入老师账户
             BigDecimal shareFee = platformFee.multiply(shareFeeRate).setScale(2, RoundingMode.HALF_UP);
             if (shareFee.compareTo(BigDecimal.ZERO) > 0) {
-                bizTypeEnum = AccountBizTypeEnum.valueOf(orderDetailVo.getGoodType().getCode() + "_SHARE");
+                AccountBizTypeEnum bizTypeEnum = AccountBizTypeEnum.valueOf(orderDetailVo.getGoodType().getCode() + "_SHARE");
                 if (null != bizTypeEnum) {
                     //插入分润老师账户变更记录-分润老师预收
                     HttpResponseResult<UserAccountRecord> recomRecordRes = userAccountService.accountRecord(