明细接口改造

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TIncomeService.java

@@ -27,9 +27,6 @@ import com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpInsuranceViewVo;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TIncome;
 import com.yifu.cloud.plus.v1.yifu.social.entity.TIncomeDetail;
 import com.yifu.cloud.plus.v1.yifu.social.vo.TIncomeSearchVo;
-import org.apache.shardingsphere.transaction.annotation.ShardingTransactionType;
-import org.apache.shardingsphere.transaction.core.TransactionType;
-import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
@@ -71,8 +68,6 @@ public interface TIncomeService extends IService<TIncome> {
 	 * @Date: 2022/9/9 11:42
 	 * @return:
 	 **/
-	@Transactional
-	@ShardingTransactionType(TransactionType.BASE)
 	boolean saveBathDetail(TIncomeDetail tIncomeDetail, String paymentId);
 
 	void pushDetail();

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TIncomeServiceImpl.java

@@ -300,22 +300,20 @@ public class TIncomeServiceImpl extends ServiceImpl<TIncomeMapper, TIncome> impl
 		TIncome income = new TIncome();
 		income.setEmpIdcard(tIncomeDetail.getEmpIdcard());
 		income.setDeptId(tIncomeDetail.getDeptId());
-		synchronized (this) {
-			List<TIncome> incomeList = baseMapper.getTIncomeList(income);
-			TIncomeDetail detail = new TIncomeDetail();
-			detail.setEmpIdcard(tIncomeDetail.getEmpIdcard());
-			detail.setDeptId(tIncomeDetail.getDeptId());
-			List<TIncomeDetail> detailList = tIncomeDetailService.getTIncomeDetailList(detail);
-			tIncomeDetail.setCreateTime(new Date());
-			tIncomeDetail.setDataCreateMonth(DateUtil.addMonth(0));
-			tIncomeDetailService.save(tIncomeDetail);
-			// 不存在，直接新增
-			if (incomeList == null || incomeList.isEmpty()) {
-				return this.savePaymentIncome(tIncomeDetail, paymentId);
-			} else {
-				// 核心判断
-				return this.copyCore(tIncomeDetail, incomeList, detailList, paymentId, true);
-			}
+		List<TIncome> incomeList = baseMapper.getTIncomeList(income);
+		TIncomeDetail detail = new TIncomeDetail();
+		detail.setEmpIdcard(tIncomeDetail.getEmpIdcard());
+		detail.setDeptId(tIncomeDetail.getDeptId());
+		List<TIncomeDetail> detailList = tIncomeDetailService.getTIncomeDetailList(detail);
+		tIncomeDetail.setCreateTime(new Date());
+		tIncomeDetail.setDataCreateMonth(DateUtil.addMonth(0));
+		tIncomeDetailService.save(tIncomeDetail);
+		// 不存在，直接新增
+		if (incomeList == null || incomeList.isEmpty()) {
+			return this.savePaymentIncomeNew(tIncomeDetail, paymentId);
+		} else {
+			// 核心判断
+			return this.copyCoreNew(tIncomeDetail, incomeList, detailList, paymentId, true);
 		}
 	}