修复提交

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/YaoDuOrderService.java

@@ -2,10 +2,11 @@ package org.jeecg.modules.api.service;
 
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.api.bean.YaoDuOrderBean;
+import org.jeecg.modules.cityShopping.entity.CityShopping;
+import org.springframework.web.bind.annotation.RequestHeader;
 
 public interface YaoDuOrderService {
 
-
     //商城-立即兑换商品
     Result<?> createPointsOrder(String token,String shopId,Integer num,String addressId);
 
@@ -37,4 +38,7 @@ public interface YaoDuOrderService {
     //查询当前开通会员以及过期时间
     Result<?> getMemberInfo(String token);
 
+    Result<?>  saveOrUpdate(String token, CityShopping cityShopping);
+
+    Result<?> update(String token,String id,String isOpen);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuApiServiceImpl.java

@@ -1547,7 +1547,7 @@ public class YaoDuApiServiceImpl implements YaoDuApiService {
 
     //查看钱包流水
     @Override
-    public Result<?> getWalletFlow(String token,PageBean pageBean){
+    public Result<?>         getWalletFlow(String token,PageBean pageBean){
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         Page<CityMoneyLog> page = new Page<CityMoneyLog>(pageBean.getPageNo(), pageBean.getPageSize());
         Page<CityMoneyLog> page1 = cityMoneyLogService
@@ -1560,7 +1560,6 @@ public class YaoDuApiServiceImpl implements YaoDuApiService {
 
 
 
-    //根据商品查询店铺商品
     @Override
     public Result<?> getGoodsList(String token,String shopId,PageBean pageBean){
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/YaoDuOrderServiceImpl.java

@@ -614,4 +614,23 @@ public class YaoDuOrderServiceImpl implements YaoDuOrderService {
                 .list();
         return Result.OK(y);
     }
+
+
+
+    @Override
+    public Result<?>  saveOrUpdate(String token, CityShopping cityShopping){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        cityShoppingService.saveOrUpdate(cityShopping);
+        return Result.OK("操作成功");
+    }
+
+
+    @Override
+    public Result<?> update(String token,String id,String isOpen){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        CityShopping byId = cityShoppingService.getById(id);
+        byId.setIsOpen(isOpen);
+        cityShoppingService.updateById(byId);
+        return Result.OK("操作成功");
+    }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuNewShopController.java

@@ -0,0 +1,17 @@
+//package org.jeecg.modules.api.yaoduapi;
+//
+//
+//import io.swagger.annotations.Api;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RestController;
+//
+//@Api(tags="瑶嘟嘟-商城优化接口")
+//@RestController
+//@RequestMapping("/shop")
+//@Slf4j
+//public class YaoDuNewShopController {
+//
+//
+//
+//}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/yaoduapi/YaoDuOrderController.java

@@ -6,6 +6,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.api.bean.YaoDuOrderBean;
 import org.jeecg.modules.api.service.YaoDuOrderService;
+import org.jeecg.modules.cityShopping.entity.CityShopping;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.springframework.web.bind.annotation.*;
 
@@ -22,6 +23,22 @@ public class YaoDuOrderController {
     private YaoDuOrderService yaoDuOrderService;
 
 
+    //商城-增加或者修改商品信息
+    @ApiOperation(value="商城-增加或者修改商品信息", notes="商城-增加或者修改商品信息")
+    @PostMapping("/saveOrUpdate")
+    public Result<?> saveOrUpdate(@RequestHeader("X-Access-Token") String token,@RequestBody CityShopping cityShopping){
+        return yaoDuOrderService.saveOrUpdate(token,cityShopping);
+    }
+
+    //商城-商品下架
+    @ApiOperation(value="商城-商品下架", notes="商城-商品下架")
+    @PostMapping("/update")
+    public Result<?> update(@RequestHeader("X-Access-Token") String token,String id,String isOpen){
+        return yaoDuOrderService.update(token,id,isOpen);
+    }
+
+
+
 
     //商城-立即兑换商品
     @ApiOperation(value="商城-立即兑换商品", notes="商城-立即兑换商品")