问题处理

hx-customer/src/main/java/com/fjhx/customer/service/customer/impl/CustomerFollowRecordsServiceImpl.java

@@ -45,7 +45,7 @@ public class CustomerFollowRecordsServiceImpl extends ServiceImpl<CustomerFollow
     public Page<CustomerFollowRecordsVo> getPage(CustomerFollowRecordsSelectDto dto) {
         IWrapper<CustomerFollowRecords> wrapper = getWrapper();
         wrapper.eq("cfr",CustomerFollowRecords::getCustomerId,dto.getCustomerId());//根据客户id过滤
-        wrapper.orderByDesc("cfr", CustomerFollowRecords::getId);
+        wrapper.orderByDesc("cfr", CustomerFollowRecords::getDate);
         Page<CustomerFollowRecordsVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<CustomerFollowRecordsVo> records = page.getRecords();
         //赋值文件列表信息

hx-ehsd/src/main/java/com/fjhx/ehsd/service/freight/impl/FreightForwarderServiceImpl.java

@@ -9,6 +9,7 @@ import com.fjhx.ehsd.entity.freight.po.FreightForwarder;
 import com.fjhx.ehsd.entity.freight.vo.FreightForwarderVo;
 import com.fjhx.ehsd.mapper.freight.FreightForwarderMapper;
 import com.fjhx.ehsd.service.freight.FreightForwarderService;
+import com.fjhx.item.entity.product.po.ProductInfo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.springframework.stereotype.Service;
 
@@ -42,11 +43,13 @@ public class FreightForwarderServiceImpl extends ServiceImpl<FreightForwarderMap
 
     @Override
     public void add(FreightForwarderDto freightForwarderDto) {
+        this.nameDuplication(FreightForwarder::getCompanyName, freightForwarderDto.getCompanyName(), "公司名称重复");
         this.save(freightForwarderDto);
     }
 
     @Override
     public void edit(FreightForwarderDto freightForwarderDto) {
+        this.nameDuplication(FreightForwarder::getCompanyName, freightForwarderDto.getCompanyName(), freightForwarderDto.getId(), "公司名称重复");
         this.updateById(freightForwarderDto);
     }
 

hx-item/src/main/java/com/fjhx/item/controller/product/ProductInfoController.java

@@ -113,6 +113,14 @@ public class ProductInfoController {
     }
 
     /**
+     * 产品库明细
+     */
+    @PostMapping("/detailByWdly")
+    public ProductInfoVo detailByWdly(@RequestBody BaseSelectDto dto) {
+        return productInfoService.detailByWdly(dto.getId());
+    }
+
+    /**
      * 产品库新增
      */
     @PostMapping("/add")

hx-item/src/main/java/com/fjhx/item/service/product/ProductInfoService.java

@@ -52,6 +52,8 @@ public interface ProductInfoService extends BaseService<ProductInfo> {
      */
     ProductInfoVo detail(Long id);
 
+    ProductInfoVo detailByWdly(Long id);
+
     /**
      * 产品库新增
      */

hx-item/src/main/java/com/fjhx/item/service/product/impl/ProductInfoServiceImpl.java

@@ -272,6 +272,12 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
     public ProductInfoVo detail(Long id) {
         ProductInfo productInfo = this.getById(id);
         ProductInfoVo result = BeanUtil.toBean(productInfo, ProductInfoVo.class);
+        return result;
+    }
+
+    @Override
+    public ProductInfoVo detailByWdly(Long id) {
+        ProductInfoVo result = detail(id);
         //赋值维多利亚组合产品信息
         JSONObject json = JSONObject.parseObject(result.getVictoriatouristJson());
         List<Long> ids = new ArrayList<>();

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdBackQualityDetailsServiceImpl.java

@@ -2,8 +2,10 @@ package com.fjhx.victoriatourist.service.jd.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.item.entity.product.po.ProductInfo;
 import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.victoriatourist.entity.jd.dto.JdBackQualityDetailsDto;
 import com.fjhx.victoriatourist.entity.jd.dto.JdBackQualityDetailsSelectDto;
@@ -77,7 +79,7 @@ public class JdBackQualityDetailsServiceImpl extends ServiceImpl<JdBackQualityDe
         return result;
     }
 
-    @Transactional(rollbackFor = Exception.class)
+    @DSTransactional
     @Override
     public void add(List<JdBackQualityDetailsDto> jdBackQualityDetailsDtoList) {
         if(ObjectUtil.isEmpty(jdBackQualityDetailsDtoList)){
@@ -95,6 +97,20 @@ public class JdBackQualityDetailsServiceImpl extends ServiceImpl<JdBackQualityDe
             //减少待质检数量
             BigDecimal quality = jdBackQualityDetailsDto.getQualifiedQuantity().add(jdBackQualityDetailsDto.getDisqualificationQuantity());
             JdBackQualityWait jdBackQualityWait = jdBackQualityWaitMap.get(jdBackQualityDetailsDto.getProductId());
+            if(ObjectUtil.isEmpty(jdBackQualityWait)){
+                ProductInfo productInfo = productInfoService.getById(jdBackQualityDetailsDto.getProductId());
+                if(ObjectUtil.isEmpty(productInfo)){
+                    throw new ServiceException("产品不存在，产品id"+jdBackQualityDetailsDto.getProductId());
+                }
+                throw new ServiceException("待质检数据不存在，产品-"+productInfo.getName());
+            }
+            if(jdBackQualityWait.getQuantity().subtract(quality).compareTo(BigDecimal.ZERO)<0){
+                ProductInfo productInfo = productInfoService.getById(jdBackQualityDetailsDto.getProductId());
+                if(ObjectUtil.isEmpty(productInfo)){
+                    throw new ServiceException("产品不存在，产品id"+jdBackQualityDetailsDto.getProductId());
+                }
+                throw new ServiceException("质检数量大于待质检数量请检查，产品id"+productInfo.getName());
+            }
 //            BigDecimal oldQuantity = jdBackQualityWait.getQuantity();
 //            jdBackQualityWait.setQuantity(oldQuantity.subtract(quality));
             jdBackQualityWaitService.update(q -> q

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdBackServiceImpl.java

@@ -127,6 +127,7 @@ public class JdBackServiceImpl extends ServiceImpl<JdBackMapper, JdBack> impleme
         logisticsInfos.setStatus(0);
         logisticsInfos.setInStockStatus(10);
         logisticsInfos.setBusinessId(jdBackDto.getId());
+        logisticsInfos.setBusinessType(4);//京东退货
         logisticsInfos.setWarehouseId(jdBackDto.getWarehouseId());
         logisticsInfos.setLogisticsCompanyCode(jdBackDto.getLogisticsCompanyCode());
         logisticsInfos.setCode(jdBackDto.getLogisticsCode());

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/utils/CodeEnum.java

@@ -29,7 +29,7 @@ public enum CodeEnum {
     //京东退货质检
     JD_BACK_QUALITY("PA", "yyMM-", "code", 3, JdBackQualityDetailsService.class),
     //异常记录
-    ABNORMAL("PO", "yyMM-", "code", 3, AbnormalInfoService.class);
+    ABNORMAL("PO", "yyMM-", "link_code", 3, AbnormalInfoService.class);
 
     CodeEnum(String prefix, String dateFormat, String codeFieldName, Integer length, Class<? extends IService<?>> serviceCls) {
         this.prefix = prefix;