Merge branch 'refs/heads/dev'

# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockDetailServiceImpl.java

eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java

@@ -409,7 +409,7 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
                 case "offline":
                     tbOrderInfo.setOrderType("线下");
                     break;
-                case "return ":
+                case "return":
                     tbOrderInfo.setOrderType("退单");
                     break;
                 default:
@@ -466,7 +466,6 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
 
             map.put("支付类型", tbOrderInfo.getPayType());
             map.put("订单金额", tbOrderInfo.getOrderAmount());
-            map.put("退单金额", tbOrderInfo.getRefundAmount());
             map.put("支付金额", tbOrderInfo.getPayAmount());
             switch (tbOrderInfo.getStatus()) {
                 case "unpaid":
@@ -485,6 +484,7 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
                     tbOrderInfo.setStatus("申请退单中");
                     break;
                 case "refund":
+                    map.put("支付金额", "-"+tbOrderInfo.getPayAmount());
                     tbOrderInfo.setStatus("退单完成");
                     break;
                 case "cancelled":

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

@@ -373,6 +373,9 @@ public class TbProductServiceImpl implements TbProductService {
                 }
             }
         }
+
+        // 默认开启共享库存和库存
+//        product.setIsDistribute(1);
         TbProduct save = tbProductRepository.save(product);
         if (save.getId() == null) {
             throw new BadRequestException("添加商品失败");
@@ -381,12 +384,24 @@ public class TbProductServiceImpl implements TbProductService {
         tbProductRepository.save(save);
         //sku
         if (resources.getSkuList() != null) {
+            Integer warnLine = 0;
+            List<TbProduct> productList = tbProductRepository.selectByShopId(resources.getShopId());
+            if (!productList.isEmpty()) {
+                TbProduct p = productList.get(0);
+                List<TbProductSku> productSkus = tbProductSkuRepository.searchSku(p.getId().toString());
+                if (!productSkus.isEmpty()) {
+                    warnLine = productSkus.get(0).getWarnLine();
+                }
+            }
+
             List<TbProductSku> skuList = new ArrayList<>();
             for (TbProductSku sku : resources.getSkuList()) {
                 sku.setProductId(String.valueOf(save.getId()));
                 sku.setShopId(save.getShopId());
                 sku.setCreatedAt(Instant.now().toEpochMilli());
                 sku.setUpdatedAt(Instant.now().toEpochMilli());
+                sku.setIsGrounding(1);
+                sku.setWarnLine(warnLine);
                 skuList.add(sku);
             }
             List<TbProductSku> tbProductSkus = tbProductSkuRepository.saveAll(skuList);
@@ -476,13 +491,28 @@ public class TbProductServiceImpl implements TbProductService {
 //                }
 //            }
             if ("sku".equals(save.getTypeEnum())) {
-                List<Integer> collect = resources.getSkuList().stream().map(TbProductSku::getId).collect(Collectors.toList());
+//                List<Integer> collect = resources.getSkuList().stream().map(TbProductSku::getId).collect(Collectors.toList());
                 List<TbProductSku> tbProductSkus = tbProductSkuRepository.searchSku(resources.getId().toString());
+                List<Integer> collect = tbProductSkus.stream().map(TbProductSku::getId).collect(Collectors.toList());
+                HashMap<String, TbProductSku> skuInfo = new HashMap<>();
                 for (TbProductSku productSkus : tbProductSkus) {
-                    if (!collect.contains(productSkus.getId())) {
-                        tbProductSkuRepository.deleteBySkuId(productSkus.getId());
+                    skuInfo.put(productSkus.getId().toString(), productSkus);
+                }
+                for (TbProductSku tbProductSku : resources.getSkuList()) {
+                    if (!collect.contains(tbProductSku.getId())) {
+                        tbProductSkuRepository.deleteBySkuId(tbProductSku.getId());
+                    }else {
+                        TbProductSku productSku = skuInfo.get(tbProductSku.getId().toString());
+                        if (productSku != null) {
+                            tbProductSku.setIsGrounding(productSku.getIsGrounding());
+                        }
                     }
                 }
+//                for (TbProductSku productSkus : tbProductSkus) {
+//                    if (!collect.contains(productSkus.getId())) {
+//                        tbProductSkuRepository.deleteBySkuId(productSkus.getId());
+//                    }
+//                }
             }
             tbProductSkuRepository.saveAll(resources.getSkuList());
         }

eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbPlussShopStaffServiceImpl.java

@@ -84,7 +84,7 @@ public class TbPlussShopStaffServiceImpl implements TbPlussShopStaffService {
         TbPlussShopStaff tbPlussShopStaff = tbPlussShopStaffRepository.findById(id).orElseGet(TbPlussShopStaff::new);
         ValidationUtil.isNull(tbPlussShopStaff.getId(),"TbPlussShopStaff","id",id);
         TbPlussShopStaffDto dto = tbPlussShopStaffMapper.toDto(tbPlussShopStaff);
-        UserDto userDto = userService.findByName(tbPlussShopStaff.getAccount());
+        UserDto userDto = userService.findByName(tbPlussShopStaff.getShopId()+"@"+tbPlussShopStaff.getAccount());
 //        dto.setUser(userDto);
         if(!CollectionUtils.isEmpty(userDto.getRoles())){
             dto.setRoleId(userDto.getRoles().stream().findFirst().get().getId());
@@ -115,7 +115,6 @@ public class TbPlussShopStaffServiceImpl implements TbPlussShopStaffService {
         if (resources.getMaxDiscountAmount().compareTo(new BigDecimal(100000000L)) > 0) {
             throw new BadRequestException("最大优惠金额过大");
         }
-
         resources.setCreatedAt(Instant.now().toEpochMilli());
 
         //添加收银系统后台账号
@@ -127,7 +126,7 @@ public class TbPlussShopStaffServiceImpl implements TbPlussShopStaffService {
             user.setPassword(passwordEncoder.encode(resources.getPassword()));
             resources.setPassword(MD5Utils.md5(resources.getPassword()));
         }
-        user.setUsername(resources.getAccount());
+        user.setUsername(resources.getShopId() + "@" +resources.getAccount());
         user.setNickName(resources.getName());
         user.setPhone(resources.getPhone());
         user.setEnabled(true);
@@ -162,9 +161,9 @@ public class TbPlussShopStaffServiceImpl implements TbPlussShopStaffService {
             throw new BadRequestException("员工编号不能包含中文");
         }
         TbPlussShopStaff tbPlussShopStaff = tbPlussShopStaffRepository.findById(resources.getId()).orElseGet(TbPlussShopStaff::new);
-        User sysUser = userRepository.findByUsername(tbPlussShopStaff.getAccount());
+        User sysUser = userRepository.findByUsername(resources.getShopId()+"@"+tbPlussShopStaff.getAccount());
         if(!tbPlussShopStaff.getAccount().equals(resources.getAccount())){
-            if (userRepository.findByUsername(resources.getAccount()) != null) {
+            if (userRepository.findByUsername(resources.getShopId()+"@"+resources.getAccount()) != null) {
                 throw new BadRequestException("员工账号不可重复");
             }
         }
@@ -180,7 +179,7 @@ public class TbPlussShopStaffServiceImpl implements TbPlussShopStaffService {
         Role role = new Role();
         role.setId(resources.getRoleId());
         roles.add(role);
-        sysUser.setUsername(resources.getAccount());
+        sysUser.setUsername(resources.getShopId()+"@"+resources.getAccount());
         sysUser.setRoles(roles);
         sysUser.setNickName(resources.getName());
         if (StringUtils.isNotBlank(resources.getPassword())) {

eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopInfoServiceImpl.java

@@ -178,6 +178,7 @@ public class TbShopInfoServiceImpl implements TbShopInfoService {
         User user = new User();
         user.setPassword(passwordEncoder.encode(resources.getPassword()));
         user.setUsername(resources.getAccount());
+        user.setNickName(resources.getShopName());
         user.setPhone(resources.getPhone());
         user.setCreateBy("admin");
         user.setEnabled(true);
@@ -240,6 +241,7 @@ public class TbShopInfoServiceImpl implements TbShopInfoService {
         TbShopInfo tbShopInfo = tbShopInfoRepository.findById(resources.getId()).orElseGet(TbShopInfo::new);
         if (!resources.getShopName().equals(tbShopInfo.getShopName())) {
             shopStaffRepository.updateNameById(resources.getShopName(),resources.getId().toString());
+            userRepository.updateNickName(resources.getAccount(),resources.getShopName());
         }
         ValidationUtil.isNull( tbShopInfo.getId(),"TbShopInfo","id",resources.getId());
         tbShopInfo.copy(resources);