代码提交

ruoyi-admin/src/main/java/com/ruoyi/web/controller/coffee/OrderController.java

@@ -88,7 +88,7 @@ public class OrderController extends BaseController
            return ajaxResult;
         }
         int amount = order.getAmount().movePointRight(2).intValue();
-        Map payInfo = weixinService.pay(request, "hooloo", order.getOrderNo(), order.getUserId(), amount);
+        Map payInfo = weixinService.pay(request, "hooloo", order.getOrderNo(), order.getUserId(), 1);
         if(payInfo !=null){
             return AjaxResult.success(payInfo);
         }else{

ruoyi-admin/src/main/java/com/ruoyi/web/controller/coffee/OrderRefundController.java

@@ -73,7 +73,7 @@ public class OrderRefundController extends BaseController
             OrderRefund orderRefund1 = (OrderRefund) obejct;
             int totalFee = orderRefund1.getTotalFee().movePointRight(2).intValue();
             int refundAmount = orderRefund1.getRefundAmount().movePointRight(2).intValue();
-            weixinService.refund(orderRefund1.getRefundNo(),orderRefund1.getOrderNo(),totalFee,refundAmount);
+            weixinService.refund(orderRefund1.getRefundNo(),orderRefund1.getOrderNo(),1,1);
             orderRefund1.setState("1");
             orderRefundService.updateOrderRefund(orderRefund1);
         }
@@ -86,7 +86,7 @@ public class OrderRefundController extends BaseController
         int totalFee = orderRefund.getTotalFee().movePointRight(2).intValue();
         int refundAmount = orderRefund.getRefundAmount().movePointRight(2).intValue();
         orderRefund.setState("1");
-        weixinService.refund(orderRefund.getRefundNo(),orderRefund.getOrderNo(),totalFee,refundAmount);
+        weixinService.refund(orderRefund.getRefundNo(),orderRefund.getOrderNo(),1,1);
         return AjaxResult.success( orderRefundService.updateOrderRefund(orderRefund));
     }
 

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -101,7 +101,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 过滤请求
                 .authorizeRequests()
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                .antMatchers("/login", "/register", "/captchaImage","/weixin/**","/application/**","/v1/**","/tool/**","/system/**").anonymous()
+                .antMatchers("/login", "/register", "/captchaImage","/weixin/**","/application/**","/v1/**","/tool/**").anonymous()
                 .antMatchers(
                         HttpMethod.GET,
                         "/",

ruoyi-system/src/main/java/com/ruoyi/system/mapper/ShopGoodsMapper.java

@@ -5,6 +5,7 @@ import java.util.List;
 import com.ruoyi.system.domain.Goods;
 import com.ruoyi.system.domain.ShopGoods;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.security.core.parameters.P;
 
 /**
  * 店铺和商品关联Mapper接口
@@ -70,4 +71,6 @@ public interface ShopGoodsMapper
 
 
     List<Goods> selectShopNoAddGoods(@Param("goodsName") String goodsName, @Param("category") String category, @Param("shopId") Long shopId);
+
+    void deleteByShopIdGoods(@Param("shopId") Long shopId, @Param("goodsIds") List<String> goodsIds);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ShopServiceImpl.java

@@ -252,7 +252,7 @@ public class ShopServiceImpl implements IShopService
         String string = body.getString("goodsIds");
         List<String> goodsIds = JSONObject.parseArray(string, String.class);
         shopGoodsSkuMapper.deleteByGoodsIds(shopId,goodsIds);
-
+        shopGoodsMapper.deleteByShopIdGoods(shopId,goodsIds);
         return null;
     }
 

ruoyi-system/src/main/resources/mapper/system/GoodsMapper.xml

@@ -44,7 +44,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createdAt != null "> and created_at = #{createdAt}</if>
             <if test="updatedAt != null "> and updated_at = #{updatedAt}</if>
             <if test="code != null  and code != ''"> and code = #{code}</if>
-            <if test="shelfAt != null  shelfAt code != ''"> and shelf_at = #{shelfAt}</if>
         </where>
     </select>
     

ruoyi-system/src/main/resources/mapper/system/ShopGoodsMapper.xml

@@ -114,6 +114,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and category  like concat('%', #{category}, '%')
         </if>
     </select>
+    <delete id="deleteByShopIdGoods">
+        delete from shop_goods where shop_id =#{shopId}
+        and goods_id in
+        <foreach collection="goodsIds" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
 
 
 </mapper>
\ No newline at end of file