|
@@ -24,6 +24,8 @@ import com.gree.mall.miniapp.logic.common.CommonLogic;
|
|
|
import com.gree.mall.miniapp.logic.common.outside.WorkOrderApiLogic;
|
|
|
import com.gree.mall.miniapp.plus.entity.*;
|
|
|
import com.gree.mall.miniapp.plus.service.*;
|
|
|
+import com.gree.mall.miniapp.utils.ApplicationContextUtils;
|
|
|
+import com.gree.mall.miniapp.utils.CommonUtils;
|
|
|
import com.gree.mall.miniapp.utils.DateUtils;
|
|
|
import com.gree.mall.miniapp.utils.StringUtil;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
@@ -31,6 +33,7 @@ import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
+import javax.servlet.http.HttpServletRequest;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
import java.util.*;
|
|
|
import java.util.function.Function;
|
|
@@ -60,6 +63,13 @@ public class OrderBaseLogic {
|
|
|
* @return
|
|
|
*/
|
|
|
public CountOrderStatusBean countOrderStatus(String pgIncreOrderId, Boolean isYb, Boolean isWb) {
|
|
|
+ HttpServletRequest request = ApplicationContextUtils.getHttpServletRequest();
|
|
|
+ String userId = CommonUtils.getUserId(request);
|
|
|
+
|
|
|
+ if (StringUtil.isEmpty(userId)){
|
|
|
+ throw new RemoteServiceException("身份已过期,请从右上角点击重新进入小程序");
|
|
|
+ }
|
|
|
+
|
|
|
CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
|
|
|
CountOrderStatusBean countOrderStatusBean = orderBaseCMapper.countOrderStatus(currentCompanyWechat.getUserId(),
|
|
|
currentCompanyWechat.getUser().getWorkerNumber(), pgIncreOrderId, isYb, isWb, currentCompanyWechat.getCompanyWechatId());
|