|
|
@@ -24,6 +24,7 @@ import com.goafanti.common.dao.OrganizationManagementMapper;
|
|
|
import com.goafanti.common.dao.TOrderBillMapper;
|
|
|
import com.goafanti.common.dao.TOrderDetailMapper;
|
|
|
import com.goafanti.common.dao.TOrderMapper;
|
|
|
+import com.goafanti.common.dao.UserMapper;
|
|
|
import com.goafanti.common.enums.DeleteStatus;
|
|
|
import com.goafanti.common.error.BusinessException;
|
|
|
import com.goafanti.common.model.Admin;
|
|
|
@@ -66,7 +67,8 @@ import com.goafanti.techproject.enums.TaskState;
|
|
|
|
|
|
@Service
|
|
|
public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements OrderService {
|
|
|
-
|
|
|
+ @Autowired
|
|
|
+ private UserMapper userMapper;
|
|
|
@Autowired
|
|
|
private TOrderMapper tOrderMapper;
|
|
|
@Autowired
|
|
|
@@ -82,7 +84,8 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
|
|
|
private final BigDecimal DEFAULT_FIRST_PAYMENT = new BigDecimal(0);// 默认首付价格
|
|
|
private final BigDecimal DEFAULT_COMMODITY_PRICE = new BigDecimal(0);// 默认单价
|
|
|
- private final String DEFAULT_PLATFORM_ID = "0";// 平台默认id
|
|
|
+ private final String DEFAULT_PLATFORM_ID = "0"; // 平台默认id
|
|
|
+ private final String DEFAULT_ADMIN_ID = "1"; //默认管理员
|
|
|
private final double DEFAULT_BROKERAGE_PROPORTION = 0; //佣金比例
|
|
|
private final double DEFAULT_COMMODITY_DISCOUNT = 1; //折扣比例
|
|
|
private final String DEFAULT_COMMODITY_MODE = "NO_MODE"; //暂无规格
|
|
|
@@ -143,8 +146,10 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
tOrder.setFirstPayment(DEFAULT_FIRST_PAYMENT);
|
|
|
tOrder.setOrderAmount(orderAmount);
|
|
|
tOrder.setOrderRemarks(remarks);
|
|
|
- tOrder.setDeleteSign(ActiveState.NORMAL.getCode());
|
|
|
+ tOrder.setDeleteSign(DeleteStatus.UNDELETE.getCode());
|
|
|
tOrder.setOrderChannel(OrderChannel.APP.getCode());
|
|
|
+ tOrder.setApproval(ApprovalState.NORMAL.getCode());
|
|
|
+ tOrder.setSalesmanId(getSalesmanIdByUid(TokenManager.getAdminId()));
|
|
|
setOrderState(OrderAction.ADD_INTENTION, new BigDecimal(0), tOrder, false);
|
|
|
|
|
|
TOrderDetail tOrderDetail = new TOrderDetail();
|
|
|
@@ -1475,4 +1480,13 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ private String getSalesmanIdByUid(String uid){
|
|
|
+ User u = userMapper.selectByPrimaryKey(uid);
|
|
|
+ if(StringUtils.isBlank(u.getAid())){
|
|
|
+ return u.getAid();
|
|
|
+ }else{
|
|
|
+ return DEFAULT_ADMIN_ID;
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|