|
@@ -22,13 +22,11 @@ import com.fs.common.exception.CustomException;
|
|
|
import com.fs.common.exception.ServiceException;
|
|
|
import com.fs.common.utils.DateUtils;
|
|
|
import com.fs.common.utils.StringUtils;
|
|
|
-import com.fs.company.domain.Company;
|
|
|
-import com.fs.company.domain.CompanyDept;
|
|
|
-import com.fs.company.domain.CompanyMoneyLogs;
|
|
|
-import com.fs.company.domain.CompanyUser;
|
|
|
+import com.fs.company.domain.*;
|
|
|
import com.fs.company.mapper.CompanyDeptMapper;
|
|
|
import com.fs.company.mapper.CompanyMapper;
|
|
|
import com.fs.company.mapper.CompanyMoneyLogsMapper;
|
|
|
+import com.fs.company.mapper.CompanyUserUserMapper;
|
|
|
import com.fs.company.service.ICompanyDeptService;
|
|
|
import com.fs.company.service.ICompanyService;
|
|
|
import com.fs.company.service.ICompanyUserService;
|
|
@@ -115,7 +113,8 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
|
|
|
|
|
|
@Autowired
|
|
|
private FsUserAddressMapper userAddressMapper;
|
|
|
-
|
|
|
+ @Autowired
|
|
|
+ private CompanyUserUserMapper companyUserUserMapper;
|
|
|
@Autowired
|
|
|
private FsStoreOrderMapper fsStoreOrderMapper;
|
|
|
|
|
@@ -539,23 +538,42 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
|
|
|
storeOrder.setStoreHouseCode("CK01");
|
|
|
storeOrder.setCompanyId(param.getCompanyId());
|
|
|
storeOrder.setCompanyUserId(param.getCompanyUserId());
|
|
|
+
|
|
|
+ String json = configService.selectConfigByKey("store.config");
|
|
|
+ StoreConfig config= JSONUtil.toBean(json,StoreConfig.class);
|
|
|
//绑定销售
|
|
|
FsUser fsuser= userService.selectFsUserById(userId);
|
|
|
- if(param.getCompanyUserId()!=null){
|
|
|
- if (ObjectUtil.isNotEmpty(fsuser.getCompanyUserId())&&fsuser.getCompanyUserId()!=param.getCompanyUserId()){
|
|
|
- CompanyUser companyUser=companyUserService.selectCompanyUserById(fsuser.getCompanyUserId());
|
|
|
- return R.error(String.format("请联系%s销售进行购买商品!",companyUser.getNickName()));
|
|
|
- }else {
|
|
|
- fsuser.setCompanyUserId(param.getCompanyUserId());
|
|
|
- userService.updateFsUser(fsuser);
|
|
|
- }
|
|
|
- CompanyUser companyUser=companyUserService.selectCompanyUserById(param.getCompanyUserId());
|
|
|
- if(companyUser!=null){
|
|
|
- storeOrder.setDeptId(companyUser.getDeptId());
|
|
|
+ if(ObjectUtil.isNotEmpty(config.getOrderAttribution())
|
|
|
+ &&config.getOrderAttribution().equals(1)){
|
|
|
+ CompanyUserUser map=new CompanyUserUser();
|
|
|
+ map.setCompanyUserId(param.getCompanyUserId());
|
|
|
+ map.setUserId(userId);
|
|
|
+ List<CompanyUserUser> list= companyUserUserMapper.selectCompanyUserUserList(map);
|
|
|
+ if(list==null||list.size()==0){
|
|
|
+ CompanyUser companyUser=companyUserService.selectCompanyUserById(param.getCompanyUserId());
|
|
|
+ if(companyUser!=null&&companyUser.getStatus().equals("0")){
|
|
|
+ map.setCompanyId(companyUser.getCompanyId());
|
|
|
+ companyUserUserMapper.insertCompanyUserUser(map);
|
|
|
+ }
|
|
|
}
|
|
|
}else {
|
|
|
- storeOrder.setCompanyUserId(fsuser.getCompanyUserId());
|
|
|
+ if(param.getCompanyUserId()!=null){
|
|
|
+ if (ObjectUtil.isNotEmpty(fsuser.getCompanyUserId())&&fsuser.getCompanyUserId()!=param.getCompanyUserId()){
|
|
|
+ CompanyUser companyUser=companyUserService.selectCompanyUserById(fsuser.getCompanyUserId());
|
|
|
+ return R.error(String.format("请联系%s销售进行购买商品!",companyUser.getNickName()));
|
|
|
+ }else {
|
|
|
+ fsuser.setCompanyUserId(param.getCompanyUserId());
|
|
|
+ userService.updateFsUser(fsuser);
|
|
|
+ }
|
|
|
+ CompanyUser companyUser=companyUserService.selectCompanyUserById(param.getCompanyUserId());
|
|
|
+ if(companyUser!=null){
|
|
|
+ storeOrder.setDeptId(companyUser.getDeptId());
|
|
|
+ }
|
|
|
+ }else {
|
|
|
+ storeOrder.setCompanyUserId(fsuser.getCompanyUserId());
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
storeOrder.setUserId(userId);
|
|
|
storeOrder.setOrderCode(orderSn);
|
|
|
storeOrder.setRealName(address.getRealName());
|
|
@@ -610,8 +628,6 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
|
|
|
storeOrder.setShippingType(1);
|
|
|
storeOrder.setCreateTime(new Date());
|
|
|
|
|
|
- String json=configService.selectConfigByKey("store.config");
|
|
|
- StoreConfig config=JSONUtil.toBean(json,StoreConfig.class);
|
|
|
if(config.getServiceFee()!=null){
|
|
|
storeOrder.setServiceFee(config.getServiceFee());
|
|
|
}
|