diff --git a/coolstore-partner-dao/src/main/resources/mapper/FirstOrderMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/FirstOrderMapper.xml
index ee9c59df6..f84cbaf23 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/FirstOrderMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/FirstOrderMapper.xml
@@ -17,8 +17,7 @@
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/openPreparation/FirstOrderDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/openPreparation/FirstOrderDTO.java
index 17c5b9f6d..be06c0050 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/dto/openPreparation/FirstOrderDTO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/openPreparation/FirstOrderDTO.java
@@ -32,7 +32,12 @@ public class FirstOrderDTO {
@ApiModelProperty("创建人")
private String createUserId;
-
+ @ApiModelProperty("加盟商")
+ private String partnerName;
+ @ApiModelProperty("创建时间")
+ private Date createTime;
+ @ApiModelProperty("更新时间")
+ private Date updateTime;
@ApiModelProperty("更新人")
private String updateUserId;
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java
index fbe6c670f..2de20dc94 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
import com.cool.store.constants.CommonConstants;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.context.LoginUserInfo;
+import com.cool.store.dao.EnterpriseUserDAO;
import com.cool.store.dao.FirstOrderDAO;
import com.cool.store.dao.ShopStageInfoDAO;
import com.cool.store.dto.openPreparation.FirstOrderDTO;
@@ -50,7 +51,8 @@ public class FirstOrderServiceImp implements FirstOrderService {
private ShopStageInfoDAO shopStageInfoDAO;
@Resource
private CoolStoreStartFlowService coolStoreStartFlowService;
-
+ @Resource
+ private EnterpriseUserDAO enterpriseUserDAO;
@Override
public Integer saveOrder(FirstOrderRequest request, LoginUserInfo user) {
log.info("save order:{}", JSONObject.toJSONString(request));
@@ -116,11 +118,17 @@ public class FirstOrderServiceImp implements FirstOrderService {
ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_15);
if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151.getShopSubStageStatus().equals(shopSubStageInfo.getShopSubStageStatus()))
{
+
+ String userName = enterpriseUserDAO.getUserName(order.getCreateUserId());
+ order.setPartnerName(userName);
order.setFirstOrderSubStage( ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151.getShopSubStageStatus());
return order;
}
if (Objects.nonNull(order)) {
try {
+
+ String userName = enterpriseUserDAO.getUserName(order.getCreateUserId());
+ order.setPartnerName(userName);
ShopInfoDO shopInfo = shopService.getShopInfo(order.getShopId());
String storeNum = shopInfo.getStoreNum();
Boolean flag = coolStoreStartFlowService.getFirstOrder(storeNum);