修复了是否设置支付密码-返回值与接口文档不一致的bug,修了收货地址列表默认地址应该只有一个的bug,修了未绑定列表返回缺少ID的bug,修复了机具申请记录列表缺少申请数量的bug

kxs-common/kxs-common-pay/pom.xml

@@ -40,4 +40,16 @@
             <version>1.3.7</version>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>11</source>
+                    <target>11</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

kxs-product/kxs-product-api/pom.xml

@@ -8,6 +8,18 @@
     </parent>
 
     <packaging>jar</packaging>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>14</source>
+                    <target>14</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
     <artifactId>kxs-product-api</artifactId>
     <properties>
         <maven.compiler.source>17</maven.compiler.source>

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/excel/ExistPayPwdVO.java

@@ -0,0 +1,9 @@
+package com.kxs.product.api.vo.kxsapp.excel;
+
+import lombok.Data;
+
+@Data
+public class ExistPayPwdVO {
+
+    private Integer payPwdStatus;
+}

kxs-product/kxs-product-api/src/main/java/com/kxs/product/api/vo/kxsapp/machine/MachineUnBindListVO.java

@@ -21,7 +21,7 @@ public class MachineUnBindListVO implements Serializable {
 
 	@Serial
 	private static final long serialVersionUID = 1L;
-
+    private Long id;
 
     /**
      * 机具码

kxs-product/kxs-product-biz/src/main/resources/mapper/KxsMachineMapper.xml

@@ -75,7 +75,7 @@
     </select>
     <select id="machineUnBindListPage" resultType="com.kxs.product.api.vo.kxsapp.machine.MachineUnBindListVO">
 
-        select cash_pledge, pos_sn, machine_type, recycle_end_time from kxs_machine
+        select id,cash_pledge, pos_sn, machine_type, recycle_end_time from kxs_machine
         <where>
             and del_flag = 0
             and bind_status = 0

kxs-store/kxs-store-api/pom.xml

@@ -59,4 +59,16 @@
             <artifactId>kxs-common-seata</artifactId>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>14</source>
+                    <target>14</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/dto/kxsapp/storeOrder/ApplyMachineDTO.java

@@ -70,9 +70,9 @@ public class ApplyMachineDTO {
 
 
     /**
-     * 申请类型 0循环申请 1兑换券
+     * 申请类型 1循环申请 0兑换券
      */
-    @Schema(description = "申请类型 0循环申请 1兑换券")
+    @Schema(description = "申请类型 1循环申请 0兑换券")
     private Integer applyType;
 
 

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsMachineApply.java

@@ -136,9 +136,9 @@ public class KxsMachineApply extends Model<KxsMachineApply> implements Serializa
 
 
     /**
-     * 申请类型 0循环申请 1兑换券
+     * 申请类型 1循环申请 0兑换券
      */
-    @Schema(description = "申请类型 0循环申请 1兑换券")
+    @Schema(description = "申请类型 1循环申请 0兑换券")
     private Integer applyType;
 
 

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/model/KxsMachineApplyDetail.java

@@ -88,9 +88,9 @@ public class KxsMachineApplyDetail extends Model<KxsMachineApplyDetail> implemen
 
 
     /**
-     * 申请类型 0循环申请 1兑换券
+     * 申请类型 1循环申请  0兑换券
      */
-    @Schema(description = "申请类型 0循环申请 1兑换券")
+    @Schema(description = "申请类型 1循环申请 0兑换券")
     private Integer applyType;
 
 

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/vo/kxsapp/store/StoreBrandListVO.java

@@ -0,0 +1,10 @@
+package com.kxs.store.api.vo.kxsapp.store;
+
+import lombok.Data;
+
+@Data
+public class StoreBrandListVO {
+    private Long id;//仓库id
+    private String warehouseName;//仓库名
+    private Integer brandId;//品牌id
+}

kxs-store/kxs-store-api/src/main/java/com/kxs/store/api/vo/kxsapp/userOrder/UserApplyMahineListVO.java

@@ -70,7 +70,6 @@ public class UserApplyMahineListVO implements Serializable {
     private String statusNo;
 
 
-
 	
 
 }

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/controller/kxsapp/StoreController.java

@@ -2,6 +2,7 @@ package com.kxs.store.biz.controller.kxsapp;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kxs.common.core.util.R;
+import com.kxs.common.security.util.SecurityUtils;
 import com.kxs.store.api.dto.kxsapp.store.StoreSearchListDTO;
 import com.kxs.store.api.vo.kxsapp.store.*;
 import com.kxs.store.biz.service.*;

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/mapper/KxsWarehouseMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kxs.store.api.dto.kxsapp.store.StoreSearchListDTO;
 import com.kxs.store.api.model.KxsWarehouse;
+import com.kxs.store.api.vo.kxsapp.store.StoreBrandListVO;
 import com.kxs.store.api.vo.kxsapp.store.StoreListVO;
 import com.kxs.store.api.vo.kxsapp.store.StoreSearchListVO;
 import org.apache.ibatis.annotations.Mapper;

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/service/impl/KxsMachineApplyServiceImpl.java

@@ -449,7 +449,7 @@ public class KxsMachineApplyServiceImpl extends ServiceImpl<KxsMachineApplyMappe
                         .getData()
                         .orElseThrow(() -> new GlobalCustomerException(StoreErrorTypeEnum.SN_FIND_NULL.getDescription()));
                 //驳回订单设置为可循环
-                machine.setReturnStatus(MachineRecycleStatusEnum.CAN_RECYCLE_STATUS.getType());
+                machine.setRecycleStatus(MachineRecycleStatusEnum.CAN_RECYCLE_STATUS.getType());
                 R<Boolean> booleanR = remoteKxsProductService.updateByMachine(machine, SecurityConstants.FROM_IN);
                 if(!booleanR.getData()){
                     throw new GlobalCustomerException(ErrorTypeEnum.REMOTE_DATA_ERROR.getDescription());

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/service/impl/KxsWarehouseServiceImpl.java

@@ -1,5 +1,6 @@
 package com.kxs.store.biz.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,6 +8,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kxs.common.security.util.SecurityUtils;
 import com.kxs.store.api.dto.kxsapp.store.StoreSearchListDTO;
 import com.kxs.store.api.model.*;
+import com.kxs.store.api.vo.kxsapp.store.StoreBrandListVO;
 import com.kxs.store.api.vo.kxsapp.store.StoreDataVO;
 import com.kxs.store.api.vo.kxsapp.store.StoreListVO;
 import com.kxs.store.api.vo.kxsapp.store.StoreSearchListVO;
@@ -15,8 +17,10 @@ import com.kxs.store.biz.constant.enums.MachineOrderStatusEnum;
 import com.kxs.store.biz.mapper.*;
 import com.kxs.store.biz.service.KxsWarehouseService;
 import lombok.RequiredArgsConstructor;
+import org.checkerframework.checker.units.qual.K;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -36,6 +40,7 @@ public class KxsWarehouseServiceImpl extends ServiceImpl<KxsWarehouseMapper, Kxs
     private final KxsMachineAdvanceMapper kxsMachineAdvanceMapper;
 
     private final KxsMachineRecycleMapper kxsMachineRecycleMapper;
+    private final KxsWarehouseMapper kxsWarehouseMapper;
 
     @Override
     public IPage<StoreSearchListVO> searchList(Page<StoreSearchListVO> page, StoreSearchListDTO param) {
@@ -76,5 +81,7 @@ public class KxsWarehouseServiceImpl extends ServiceImpl<KxsWarehouseMapper, Kxs
 
         return storeDataVO;
     }
+
+
 }
 

kxs-store/kxs-store-biz/src/main/resources/mapper/KxsWarehouseMapper.xml

@@ -53,6 +53,8 @@
         select id, brand_id, warehouse_phone, warehouse_no, warehouse_name, brand_name
         from kxs_warehouse
         where user_id = #{userId}
+          and del_flag = 0
     </select>
 
+
 </mapper>

kxs-system/kxs-system-api/pom.xml

@@ -54,4 +54,16 @@
             <artifactId>kxs-common-mq</artifactId>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>14</source>
+                    <target>14</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

kxs-user/kxs-user-api/pom.xml

@@ -8,6 +8,18 @@
     </parent>
 
     <packaging>jar</packaging>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>14</source>
+                    <target>14</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
     <artifactId>kxs-user-api</artifactId>
     <properties>
         <maven.compiler.source>17</maven.compiler.source>

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/service/KxsUserService.java

@@ -2,6 +2,7 @@ package com.kxs.user.biz.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.kxs.common.core.util.R;
+import com.kxs.product.api.vo.kxsapp.excel.ExistPayPwdVO;
 import com.kxs.user.api.dto.kxsapp.app.ForgetPwdDTO;
 import com.kxs.user.api.dto.kxsapp.app.RegisterDTO;
 import com.kxs.user.api.dto.kxsapp.user.*;
@@ -48,7 +49,7 @@ public interface KxsUserService extends IService<KxsUser> {
      *
      * @return {@link Boolean}
      */
-    Boolean existPayPwd();
+    ExistPayPwdVO existPayPwd();
 
     /**
      * 检查支付PWD

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/service/impl/KxsUserAddressServiceImpl.java

@@ -1,5 +1,6 @@
 package com.kxs.user.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kxs.common.core.util.R;
 import com.kxs.common.security.util.SecurityUtils;
@@ -8,6 +9,7 @@ import com.kxs.user.api.vo.kxsapp.userAddress.UserAddressListVO;
 import com.kxs.user.biz.mapper.KxsUserAddressMapper;
 import com.kxs.user.api.model.KxsUserAddress;
 import com.kxs.user.biz.service.KxsUserAddressService;
+import org.bouncycastle.jcajce.provider.symmetric.AES;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
@@ -30,12 +32,21 @@ public class KxsUserAddressServiceImpl extends ServiceImpl<KxsUserAddressMapper,
 
     @Override
     public R userAddressSave(UserAddressDTO param) {
-
+        Long id = SecurityUtils.getUser().getId();
         KxsUserAddress userAddress = new KxsUserAddress();
         BeanUtils.copyProperties(param, userAddress);
-        userAddress.setUserId(SecurityUtils.getUser().getId().intValue());
+        userAddress.setUserId(id.intValue());
         this.saveOrUpdate(userAddress);
-
+        //设置默认地址时,会将其他地址全部设为非默认
+        if (param.getIsDefault() == 1){
+            List<KxsUserAddress> list = list(Wrappers.<KxsUserAddress>query().lambda().ne(KxsUserAddress::getId, userAddress.getId()).eq(KxsUserAddress::getUserId, id));
+            for (KxsUserAddress kxsUserAddress : list) {
+                if (kxsUserAddress.getIsDefault() == 1) {
+                    kxsUserAddress.setIsDefault(0);
+                    updateById(kxsUserAddress);
+                }
+            }
+        }
         return R.ok();
     }
 }

kxs-user/kxs-user-biz/src/main/java/com/kxs/user/biz/service/impl/KxsUserServiceImpl.java

@@ -19,6 +19,7 @@ import com.kxs.common.core.util.AssertUtil;
 import com.kxs.common.core.util.R;
 import com.kxs.common.core.util.SpringContextHolder;
 import com.kxs.common.security.util.SecurityUtils;
+import com.kxs.product.api.vo.kxsapp.excel.ExistPayPwdVO;
 import com.kxs.store.api.feign.RemoteKxsStoreService;
 import com.kxs.store.api.model.KxsWarehouseLimit;
 import com.kxs.system.api.feign.RemoteUserMsgService;
@@ -225,13 +226,16 @@ public class KxsUserServiceImpl extends ServiceImpl<KxsUserMapper, KxsUser> impl
     }
 
     @Override
-    public Boolean existPayPwd() {
+    public ExistPayPwdVO existPayPwd() {
 
         KxsUser user = this.getById(SecurityUtils.getUser().getId());
+        ExistPayPwdVO existPayPwdVO = new ExistPayPwdVO();
         if(CharSequenceUtil.isBlank(user.getPayPwd())){
-            return Boolean.FALSE;
+            existPayPwdVO.setPayPwdStatus(0);
+            return existPayPwdVO;
         }
-        return Boolean.TRUE;
+        existPayPwdVO.setPayPwdStatus(1);
+        return existPayPwdVO;
     }
 
     @Override