Add appKey to PayAppDO and update PayOrderApi to use appKey

- Added `appKey` field to `PayAppDO` to store application secret key.
- Updated `PayOrderService` interface to include `appKey` parameter in `getOrder` and `createOrder` methods.
- Implemented `getOrder` method in `PayOrderServiceImpl` to fetch `PayOrderDO` using `appKey` and `merchantOrderId`.
- Added necessary validation and exception handling for `appKey` in `PayOrderServiceImpl`.

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyController.java

@@ -17,8 +17,10 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
 
 @Tag(name = "管理后台 - 商品属性项")
 @RestController
@@ -70,4 +72,12 @@ public class ProductPropertyController {
         return success(BeanUtils.toBean(pageResult, ProductPropertyRespVO.class));
     }
 
+    @GetMapping("/simple-list")
+    @Operation(summary = "获得属性项精简列表")
+    public CommonResult<List<ProductPropertyRespVO>> getPropertySimpleList() {
+        List<ProductPropertyDO> list = productPropertyService.getPropertyList();
+        return success(convertList(list, property -> new ProductPropertyRespVO() // 只返回 id、name 属性
+                .setId(property.getId()).setName(property.getName())));
+    }
+
 }

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/property/ProductPropertyValueController.java

@@ -17,8 +17,11 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.singleton;
 
 @Tag(name = "管理后台 - 商品属性值")
 @RestController
@@ -70,4 +73,13 @@ public class ProductPropertyValueController {
         return success(BeanUtils.toBean(pageResult, ProductPropertyValueRespVO.class));
     }
 
+    @GetMapping("/simple-list")
+    @Operation(summary = "获得属性值精简列表")
+    @Parameter(name = "propertyId", description = "属性项编号", required = true, example = "1024")
+    public CommonResult<List<ProductPropertyValueRespVO>> getPropertyValueSimpleList(@RequestParam("propertyId") Long propertyId) {
+        List<ProductPropertyValueDO> list = productPropertyValueService.getPropertyValueListByPropertyId(singleton(propertyId));
+        return success(convertList(list, value -> new ProductPropertyValueRespVO() // 只返回 id、name 属性
+                .setId(value.getId()).setName(value.getName())));
+    }
+
 }

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/dataobject/property/ProductPropertyDO.java

@@ -39,10 +39,6 @@ public class ProductPropertyDO extends BaseDO {
      * 名称
      */
     private String name;
-    /**
-     * 状态
-     */
-    private Integer status;
     /**
      * 备注
      */

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/property/ProductPropertyService.java

@@ -62,4 +62,11 @@ public interface ProductPropertyService {
      */
     List<ProductPropertyDO> getPropertyList(Collection<Long> ids);
 
+    /**
+     * 获得指定状态的属性项列表
+     *
+     * @return 属性项列表
+     */
+    List<ProductPropertyDO> getPropertyList();
+
 }

yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/property/ProductPropertyServiceImpl.java

@@ -109,4 +109,9 @@ public class ProductPropertyServiceImpl implements ProductPropertyService {
         return productPropertyMapper.selectBatchIds(ids);
     }
 
+    @Override
+    public List<ProductPropertyDO> getPropertyList() {
+        return productPropertyMapper.selectList();
+    }
+
 }

yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/dataobject/app/PayAppDO.java

@@ -59,4 +59,9 @@ public class PayAppDO extends BaseDO {
      */
     private String transferNotifyUrl;
 
-}
+    /**
+     * 应用密钥
+     */
+    private String appKey;
+
+}

yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/order/PayOrderService.java

@@ -146,4 +146,22 @@ public interface PayOrderService {
      */
     int expireOrder();
 
-}
+    /**
+     * 获得支付订单
+     *
+     * @param appKey 应用密钥
+     * @param merchantOrderId 商户订单编号
+     * @return 支付订单
+     */
+    PayOrderDO getOrder(String appKey, String merchantOrderId);
+
+    /**
+     * 创建支付单
+     *
+     * @param reqDTO 创建请求
+     * @param appKey 应用密钥
+     * @return 支付单编号
+     */
+    Long createOrder(@Valid PayOrderCreateReqDTO reqDTO, String appKey);
+
+}

yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceImpl.java

@@ -85,6 +85,15 @@ public class PayOrderServiceImpl implements PayOrderService {
         return orderMapper.selectByAppIdAndMerchantOrderId(appId, merchantOrderId);
     }
 
+    @Override
+    public PayOrderDO getOrder(String appKey, String merchantOrderId) {
+        PayAppDO app = appService.getAppByAppKey(appKey);
+        if (app == null) {
+            throw exception(PAY_APP_NOT_FOUND);
+        }
+        return orderMapper.selectByAppIdAndMerchantOrderId(app.getId(), merchantOrderId);
+    }
+
     @Override
     public List<PayOrderDO> getOrderList(Collection<Long> ids) {
         if (CollUtil.isEmpty(ids)) {