Merge remote-tracking branch 'origin/master'

hx-sale/src/main/java/com/fjhx/sale/service/claim/impl/ClaimServiceImpl.java

@@ -99,6 +99,7 @@ public class ClaimServiceImpl extends ServiceImpl<ClaimMapper, Claim> implements
     @Override
     @DSTransactional
     public void delete(Long id) {
+        //通过流水ID查找出到账认领的数据
         Claim claim = this.getOne(Wrappers.<Claim>query().lambda().eq(Claim::getBusinessId,id));
         if(ObjectUtils.isNotEmpty(claim.getBusinessId())){
             //更新流水数据为认领状态
@@ -106,9 +107,10 @@ public class ClaimServiceImpl extends ServiceImpl<ClaimMapper, Claim> implements
             water.setId(claim.getBusinessId());
             water.setIsClaim(0);//未认领状态
             accountRunningWaterService.updateById(water);
+            this.removeById(claim.getId());
+            claimContractService.remove(Wrappers.<ClaimContract>query().lambda().eq(ClaimContract::getClaimId,claim.getId()));
         }
-        this.removeById(Wrappers.<Claim>query().lambda().eq(Claim::getBusinessId,id));
-        claimContractService.remove(Wrappers.<ClaimContract>query().lambda().eq(ClaimContract::getClaimId,claim.getId()));
+
     }
 
 }

hx-sale/src/main/java/com/fjhx/sale/service/pack/PackService.java

@@ -7,6 +7,8 @@ import com.fjhx.sale.entity.pack.vo.PackVo;
 import com.fjhx.sale.entity.pack.dto.PackSelectDto;
 import com.fjhx.sale.entity.pack.dto.PackDto;
 
+import java.util.Map;
+
 
 /**
  * <p>
@@ -43,4 +45,9 @@ public interface PackService extends BaseService<Pack> {
      */
     void delete(Long id);
 
+    /**
+     * 生成PDF
+     * @return
+     */
+    Map<String,Object> generatePdf(Long id);
 }

hx-sale/src/main/java/com/fjhx/sale/service/pack/impl/PackServiceImpl.java

@@ -28,6 +28,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -134,4 +135,15 @@ public class PackServiceImpl extends ServiceImpl<PackMapper, Pack> implements Pa
         this.removeById(id);
     }
 
+    /**
+     * 生成PDF
+     * @return
+     */
+    @Override
+    public Map<String, Object> generatePdf(Long id) {
+        //查询装箱单
+        getById(id);
+        return null;
+    }
+
 }