|
@@ -10,12 +10,10 @@ import com.huimv.farm.damsubsidy.common.token.TokenSign;
|
|
|
import com.huimv.farm.damsubsidy.common.utils.Result;
|
|
|
import com.huimv.farm.damsubsidy.common.utils.ResultCode;
|
|
|
import com.huimv.farm.damsubsidy.common.utils.UploadImage;
|
|
|
-import com.huimv.farm.damsubsidy.entity.BaseAnimal;
|
|
|
-import com.huimv.farm.damsubsidy.entity.BillBuyInfo;
|
|
|
-import com.huimv.farm.damsubsidy.entity.BillBuyInfoVo;
|
|
|
-import com.huimv.farm.damsubsidy.entity.SysUser;
|
|
|
+import com.huimv.farm.damsubsidy.entity.*;
|
|
|
import com.huimv.farm.damsubsidy.mapper.BaseAnimalMapper;
|
|
|
import com.huimv.farm.damsubsidy.mapper.BillBuyInfoMapper;
|
|
|
+import com.huimv.farm.damsubsidy.mapper.BillLandingInspectionMapper;
|
|
|
import com.huimv.farm.damsubsidy.mapper.SysUserMapper;
|
|
|
import com.huimv.farm.damsubsidy.service.IBillBuyInfoService;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
@@ -51,6 +49,8 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
|
|
|
private BillBuyInfoMapper billBuyInfoMapper;
|
|
|
@Resource
|
|
|
private SysUserMapper sysUserMapper;
|
|
|
+ @Resource
|
|
|
+ private BillLandingInspectionMapper billLandingInspectionMapper;
|
|
|
|
|
|
@Override
|
|
|
@Transactional
|
|
@@ -126,6 +126,8 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
|
|
|
|
|
|
BillBuyInfo billBuyInfo1 = billBuyInfoMapper.selectOne(new QueryWrapper<BillBuyInfo>().eq("create_user", TokenSign.getMemberIdByJwtToken(httpServletRequest)).eq("bill_buy_status",1));
|
|
|
SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().eq("phone", buyerPhone));
|
|
|
+ BillLandingInspection billLandingInspection = billLandingInspectionMapper.selectOne(new QueryWrapper<BillLandingInspection>().eq("inspection_num", inspectionNum));
|
|
|
+
|
|
|
if (ObjectUtil.isNotEmpty(sysUser)){
|
|
|
if (!sysUser.getUserName().equals(buyer)){
|
|
|
return new Result(10001,"买家手机号和姓名不匹配",false);
|
|
@@ -278,6 +280,7 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
|
|
|
billBuyInfo.setCreateTime(DateTime.now());
|
|
|
billBuyInfo.setRealNumUp(num);
|
|
|
billBuyInfo.setBuyPicUrl(content);
|
|
|
+ billBuyInfo.setSellerId(billLandingInspection.getCreateUser());
|
|
|
billBuyInfo.setPayPicUrl(content2);
|
|
|
billBuyInfo.setBuyPayGoodsPicUrl(content3);
|
|
|
billBuyInfo.setRealEartag(eartags);
|
|
@@ -290,6 +293,7 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
|
|
|
billBuyInfo1.setSellerName(seller);
|
|
|
billBuyInfo1.setBuyerPhone(buyerPhone);
|
|
|
billBuyInfo1.setCreateUser(TokenSign.getMemberIdByJwtToken(httpServletRequest));
|
|
|
+ billBuyInfo1.setSellerId(billLandingInspection.getCreateUser());
|
|
|
billBuyInfo1.setCreateTime(DateTime.now());
|
|
|
billBuyInfo1.setRealNumUp(num);
|
|
|
billBuyInfo1.setBuyPicUrl(content);
|