111

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/open/nologin/ServiceNoLoginEndPoint.java

@@ -31,6 +31,7 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -68,6 +69,8 @@ public class ServiceNoLoginEndPoint extends EnvelopRestEndpoint {
    private BaseTownService baseTownService;
    @Autowired
    private WlyyHttpLogService wlyyHttpLogService;
    @Value("${spring.profiles}")
    private String springProfiles;
    @GetMapping(value = "/devinfo")
    @ApiOperation(value = "获取单个设备上的所有广告")
@@ -164,10 +167,13 @@ public class ServiceNoLoginEndPoint extends EnvelopRestEndpoint {
            }
        }
        //拉取线下智业订单
        if (StringUtils.isNoneBlank(cardNum)){
            orderservice.getPhysicApplyWaitExecList(deviceId,cardNum,patientName);
        if (!"jwtest".equals(springProfiles)){//测试线不走这个
            //拉取线下智业订单
            if (StringUtils.isNoneBlank(cardNum)){
                orderservice.getPhysicApplyWaitExecList(deviceId,cardNum,patientName);
            }
        }
        JSONObject jsonObject =  orderservice.checkOrderAndReturnOrderList(deviceId, pickUpNum, cardNum,patientName);
        if (jsonObject.getString("response").equalsIgnoreCase(ConstantUtils.FAIL)) {
            return failed(jsonObject.getString("msg"));