perf: 更改回调地址 商品接口增加typeEnum

eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbPlaceController.java

@@ -56,10 +56,11 @@ public class TbPlaceController {
     @ApiOperation("查询/product")
     public ResponseEntity<Object> queryActivateTbProductInfo(@RequestParam(defaultValue = "0") Integer page,
                                                              @RequestParam(defaultValue = "30") Integer size,
+                                                             @RequestParam(required = false) String typeEnum,
                                                              @RequestParam(required = false) Integer categoryId,
                                                              @RequestParam Integer shopId,
                                                              @RequestParam(required = false) Integer productId) {
-        return new ResponseEntity<>(tbProductService.activateProduct(page, size, categoryId, shopId, productId), HttpStatus.OK);
+        return new ResponseEntity<>(tbProductService.activateProduct(page, size, categoryId, shopId, productId, typeEnum), HttpStatus.OK);
     }
 
     public TbPlaceController(TbShopTableService tbShopTableService, TbProductService tbProductService, RabbitMsgUtils rabbitMsgUtils) {

eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java

@@ -754,10 +754,11 @@ public class TbProductServiceImpl implements TbProductService {
     }
 
     @Override
-    public Object activateProduct(Integer page, Integer size, Integer categoryId, Integer shopId, Integer productId) {
+    public Object activateProduct(Integer page, Integer size, Integer categoryId, Integer shopId, Integer productId, String typeEnum) {
         com.baomidou.mybatisplus.extension.plugins.pagination.Page<TbProduct> page1 = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(page, size);
         QueryWrapper<TbProduct> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_del", 0)
+                .eq("type_enum", typeEnum)
                 .eq("shop_id", shopId)
                 .eq("is_delete", 0)
                 .eq("status", 1)

eladmin-system/src/main/java/cn/ysk/cashier/service/product/TbProductService.java

@@ -106,5 +106,5 @@ public interface TbProductService {
      */
     void returnStockByPro(Integer productId, Integer productSkuId, Integer num);
 
-    Object activateProduct(Integer page, Integer size, Integer categoryId, Integer shopId, Integer productId);
+    Object activateProduct(Integer page, Integer size, Integer categoryId, Integer shopId, Integer productId, String typeEnum);
 }

eladmin-system/src/main/resources/config/application-dev.yml

@@ -146,4 +146,10 @@ decorator:
       multiline: false
 cashier:
   server:
-    wx: https://wxcashiertest.sxczgkj.cn/
+    wx: https://wxcashiertest.sxczgkj.cn/
+
+# 三方支付回调信息
+thirdPay:
+  notify:
+    fstPay: https://admintestpapi.sxczgkj.cn/notify/fstPay
+    fstReturn: https://admintestpapi.sxczgkj.cn/notify/fstReturn

eladmin-system/src/main/resources/config/application-pre.yml

@@ -138,3 +138,8 @@ file:
 cashier:
   server:
     wx: https://pre-cashier.sxczgkj.cn/
+
+thirdPay:
+  notify:
+    fstPay: https://pre-cashiernewadmin.sxczgkj.cn/notify/fstPay
+    fstReturn: https://pre-cashiernewadmin.sxczgkj.cn/notify/fstReturn

eladmin-system/src/main/resources/config/application.yml

@@ -65,11 +65,7 @@ qrcode: https://kysh.sxczgkj.cn/codeplate?code=
 thirdPay:
   groupCallBack: https://wxcashiertest.sxczgkj.cn/cashierService/notify/notifyCallBackGroup
   payType: fushangtong
-  callBack: https://cashierclient.sxczgkj.cn/cashier-client/notify/notifyPay
   url: https://paymentapi.sxczgkj.cn
-  notify:
-    fstPay: https://admintestpapi.sxczgkj.cn/notify/fstPay
-    fstReturn: https://admintestpapi.sxczgkj.cn/notify/fstReturn
 
 mybatis-plus:
   mapper-locations: classpath:/cn/ysk/cashier/mybatis/mapper/*Mapper.xml