|
|
@@ -785,6 +785,8 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
|
|
|
storeOrder.setStoreHouseCode("CK01");
|
|
|
storeOrder.setCompanyId(param.getCompanyId());
|
|
|
storeOrder.setCompanyUserId(param.getCompanyUserId());
|
|
|
+
|
|
|
+ storeOrder.setPrescribeId(param.getPrescribeId());
|
|
|
//绑定销售
|
|
|
FsUserScrm fsuser = userService.selectFsUserById(userId);
|
|
|
// if (param.getCompanyUserId() != null) {
|
|
|
@@ -1648,6 +1650,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
|
|
|
public R createUserOrder(FsStoreOrderCreateUserParam param) {
|
|
|
|
|
|
FsCompanyExternalPayReceipt receipt = null;
|
|
|
+ Long prescribeId = null;
|
|
|
if (param.getCompanyCustomerId() != null) {
|
|
|
if (param.getPhone() == null) {
|
|
|
return R.error("手机号码不能为空");
|
|
|
@@ -1658,6 +1661,10 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
|
|
|
if (fsCompanyCustomer == null) {
|
|
|
return R.error("客户信息为空,制单失败");
|
|
|
}
|
|
|
+ if (fsCompanyCustomer.getPrescribeId() == null) {
|
|
|
+ return R.error("处方信息为空,制单失败");
|
|
|
+ }
|
|
|
+ prescribeId = fsCompanyCustomer.getPrescribeId();
|
|
|
param.setUserId(1L);
|
|
|
//保存收货地址
|
|
|
FsUserAddressScrm address = new FsUserAddressScrm();
|
|
|
@@ -1752,6 +1759,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
|
|
|
createParam.setReceipt(receipt);//收款信息
|
|
|
createParam.setCompanyCustomerId(param.getCompanyCustomerId());
|
|
|
createParam.setPrepaidAmount(param.getPrepaidAmount());//预付金额
|
|
|
+ createParam.setPrescribeId(prescribeId);
|
|
|
return this.createOrder(param.getUserId(), createParam);
|
|
|
} else {
|
|
|
throw new CustomException("创建失败");
|