From cbe3888bb6b1012273f16409f988114abd4542c5 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 30 八月 2023 14:10:00 +0800
Subject: [PATCH] 新增小程序商家购买下单接口    小程序积分兑换记录列表修改

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerIntegralMerchantApi.java |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerIntegralMerchantApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerIntegralMerchantApi.java
index 1af57bd..7e9cd9f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerIntegralMerchantApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerIntegralMerchantApi.java
@@ -216,7 +216,7 @@
                      @RequestParam(value = "userName", required = false) String userName,
                      @RequestParam(value = "communityId", required = false) String communityId,
                      @RequestParam(value = "userId", required = false) String userId,
-                     @RequestParam(value = "orderType", required = true) String orderType)
+                     @RequestParam(value = "orderType", required = false) String orderType)
     {
         return vceService.getList(pageNum,pageSize,goodsId,orderNumber,goodsName,
                 condition,userName,communityId,userId,orderType);
@@ -256,6 +256,24 @@
     }
 
     /**
+     * 新增用户购买商家商品记录
+     * @param
+     * @return
+     */
+    @PostMapping("/order/insertMerchantData")
+    public R insertMerchantData(@RequestBody VolunteerCreditsExchangeVO item)
+    {
+        LoginUserInfoVO userInfoVO= getLoginUserInfo();
+        if(StringUtils.isEmpty(item.getCommunityId()))
+        {
+            item.setCommunityId(userInfoVO.getCommunityId()+"");
+        }
+
+        item.setUserId(userInfoVO.getUserId()+"");
+        return vceService.insertMerchantData(item);
+    }
+
+    /**
      * 更新
      * @param item
      * @return

--
Gitblit v1.7.1