Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-api-cloud

pjcloud-canteen/pjcloud-canteen-api/src/main/java/com/bsd/pjcloud/canteen/vo/erp/CanteenSpuStockVO.java

@@ -0,0 +1,44 @@
+package com.bsd.pjcloud.canteen.vo.erp;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 菜品库存VO
+ *
+ * @author zhangjiafu
+ */
+@Data
+@Schema(description = "菜品库存VO")
+public class CanteenSpuStockVO {
+
+    /**
+     * 商品 SPU 编号
+     */
+    @Schema(description = "库存ida")
+    private Long id;
+
+    /**
+     * 商品名称
+     */
+    @Schema(description = "商品名称")
+    private String name;
+
+    /**
+     * 商品封面图
+     */
+    @Schema(description = "商品封面图")
+    private String picUrl;
+
+    /**
+     * 期初库存
+     */
+    @Schema(description = "期初库存")
+    private Double baseStock;
+
+    /**
+     * 当前库存
+     */
+    @Schema(description = "当前库存")
+    private Double currentStock;
+} 

pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/controller/ThirdPartyOAth2Cotroller.java

@@ -218,12 +218,12 @@ public class ThirdPartyOAth2Cotroller {
         if(!CollectionUtils.isEmpty(sysUserList)){
             SysUser sysUser = sysUserList.get(0);
             //判断当前用户设备是否信任
-//            String md5 = DeviceFingerprintUtil.generate(httpServletRequest);
-//            R<UserTrustedDeviceEntity> userTrustedDeviceR = remoteUserTrustedDeviceService.getUserTrustedDeviceByIdAndMD5(sysUser.getPhone(), md5);
-//            UserTrustedDeviceEntity userTrustedDevice = userTrustedDeviceR.getData();
-//            if (userTrustedDevice == null || userTrustedDevice.getExpireTime().isBefore(LocalDateTime.now())){
-//                return R.failed(-1,"请先信任设备");
-//            }
+            String md5 = DeviceFingerprintUtil.generate(httpServletRequest);
+            R<UserTrustedDeviceEntity> userTrustedDeviceR = remoteUserTrustedDeviceService.getUserTrustedDeviceByIdAndMD5(sysUser.getPhone(), md5);
+            UserTrustedDeviceEntity userTrustedDevice = userTrustedDeviceR.getData();
+            if (userTrustedDevice == null || userTrustedDevice.getExpireTime().isBefore(LocalDateTime.now())){
+                return R.failed(-1,"请先信任设备");
+            }
             //登录成功生成token
             UserTokenDTO userTokenDTO = new UserTokenDTO();
             userTokenDTO.setSysUser(sysUser);