Merge branch 'master' into release

dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/product/user/ProductUserQueryController.java

@@ -67,8 +67,7 @@ public class ProductUserQueryController {
     @GetMapping("page/product/by/matchmaker")
     @ApiOperation("红娘合伙人获取商品分页列表")
     public QnPage<UserPageProductByMatchmakerVo> userPageProductByMatchMaker(PageUtil pageUtil,
-                                                                             UserPageProductByMatchmakerQueryParam queryParam,
-                                                                             @RequestParam("userId") Long userId) {
+                                                                             UserPageProductByMatchmakerQueryParam queryParam) {
         return PageUtil.convert(productQueryService.pageProductByMatchmaker(pageUtil, queryParam), UserPageProductByMatchmakerVo.class);
     }
 

dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/revenuereward/user/RevenueRewardUserQueryController.java

@@ -43,11 +43,12 @@ public class RevenueRewardUserQueryController {
                                                                           UsePageRevenueRewardRecordQueryParams queryParams,
                                                                           @RequestParam("userId") Long userId,
                                                                           @RequestHeader(name = RequestHeaderFields.FIELD_ORGANIZATION_ID, required = false) Long orgId) {
-        if (Objects.isNull(queryParams.getQueryOrgId())) {
-            queryParams.setQueryOrgId(orgId);
-        }
         if (Objects.isNull(queryParams.getQueryOrgId()) && Objects.isNull(queryParams.getQueryUserId())) {
-            queryParams.setQueryUserId(userId);
+            if (Objects.nonNull(orgId)){
+                queryParams.setQueryOrgId(orgId);
+            }else{
+                queryParams.setQueryUserId(userId);
+            }
         }
         return PageUtil.convert(revenueRewardQueryService.pageRevenueRewardRecord(pageUtil, queryParams), UseGetRevenueRewardRecordVo.class);
     }

dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/order/OrderApplicationService.java

@@ -282,7 +282,7 @@ public class OrderApplicationService extends BaseApplicationService {
     private void checkMinAmount(MarriageBountyOrder marriageBountyOrder, Order order) {
         RewardTypeEnum rewardType = marriageBountyOrder.getMinAmountType();
         RewardConfig rewardConfig = rewardConfigQueryService.queryByRewardType(rewardType);
-        if (Objects.nonNull(rewardConfig) && new BigDecimal(rewardConfig.getValue()).compareTo(order.getSettlementAmount()) > 0) {
+        if (Objects.nonNull(rewardConfig) && new BigDecimal(rewardConfig.getValue()).compareTo(order.getOriginalAmount()) > 0) {
             throw new BizException("悬赏招亲发布最低" + rewardConfig.getValue() + "元");
         }
     }

dating-agency-mall-server/src/main/resources/mapper/order/WalletAccountAssociateOrderRecordDao.xml

@@ -100,6 +100,7 @@
             dao.order_belong_name,
             dao.order_type,
             dao.order_code,
+            dao.original_amount,
             dao.settlement_amount,
             dao.paid_time,
             dao.`status`